summaryrefslogtreecommitdiffhomepage
path: root/runsc/main.go
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2020-08-19 18:35:35 -0700
committerAndrei Vagin <avagin@gmail.com>2020-09-09 17:53:10 -0700
commit8a725d8a66ef1c38b256c52c1865e5000cc8ca36 (patch)
tree026860ed255b567b63c2e8c2e2cf832060a99a67 /runsc/main.go
parent00ee4cb1a26d8f3cabbbb7fc05d719d8aabbee60 (diff)
Move boot.Config to its own package
Updates #3494 PiperOrigin-RevId: 327548511
Diffstat (limited to 'runsc/main.go')
-rw-r--r--runsc/main.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/runsc/main.go b/runsc/main.go
index 69cb505fa..c2ffecbdc 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -32,8 +32,8 @@ import (
"gvisor.dev/gvisor/pkg/log"
"gvisor.dev/gvisor/pkg/refs"
"gvisor.dev/gvisor/pkg/sentry/platform"
- "gvisor.dev/gvisor/runsc/boot"
"gvisor.dev/gvisor/runsc/cmd"
+ "gvisor.dev/gvisor/runsc/config"
"gvisor.dev/gvisor/runsc/flag"
"gvisor.dev/gvisor/runsc/specutils"
)
@@ -174,21 +174,21 @@ func main() {
cmd.Fatalf("%v", err)
}
- fsAccess, err := boot.MakeFileAccessType(*fileAccess)
+ fsAccess, err := config.MakeFileAccessType(*fileAccess)
if err != nil {
cmd.Fatalf("%v", err)
}
- if fsAccess == boot.FileAccessShared && *overlay {
+ if fsAccess == config.FileAccessShared && *overlay {
cmd.Fatalf("overlay flag is incompatible with shared file access")
}
- netType, err := boot.MakeNetworkType(*network)
+ netType, err := config.MakeNetworkType(*network)
if err != nil {
cmd.Fatalf("%v", err)
}
- wa, err := boot.MakeWatchdogAction(*watchdogAction)
+ wa, err := config.MakeWatchdogAction(*watchdogAction)
if err != nil {
cmd.Fatalf("%v", err)
}
@@ -197,12 +197,12 @@ func main() {
cmd.Fatalf("num_network_channels must be > 0, got: %d", *numNetworkChannels)
}
- refsLeakMode, err := boot.MakeRefsLeakMode(*referenceLeakMode)
+ refsLeakMode, err := config.MakeRefsLeakMode(*referenceLeakMode)
if err != nil {
cmd.Fatalf("%v", err)
}
- queueingDiscipline, err := boot.MakeQueueingDiscipline(*qDisc)
+ queueingDiscipline, err := config.MakeQueueingDiscipline(*qDisc)
if err != nil {
cmd.Fatalf("%s", err)
}
@@ -212,7 +212,7 @@ func main() {
refs.SetLeakMode(refsLeakMode)
// Create a new Config from the flags.
- conf := &boot.Config{
+ conf := &config.Config{
RootDir: *rootDir,
Debug: *debug,
LogFilename: *logFilename,