diff options
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/boot/config.go | 4 | ||||
| -rw-r--r-- | runsc/main.go | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/runsc/boot/config.go b/runsc/boot/config.go index 6c69a7c38..bc392deb3 100644 --- a/runsc/boot/config.go +++ b/runsc/boot/config.go @@ -76,7 +76,7 @@ const ( // MakeFileAccessType converts type from string. func MakeFileAccessType(s string) (FileAccessType, error) { switch s { - case "proxy": + case "proxy-shared": return FileAccessProxy, nil case "proxy-exclusive": return FileAccessProxyExclusive, nil @@ -90,7 +90,7 @@ func MakeFileAccessType(s string) (FileAccessType, error) { func (f FileAccessType) String() string { switch f { case FileAccessProxy: - return "proxy" + return "proxy-shared" case FileAccessProxyExclusive: return "proxy-exclusive" case FileAccessDirect: diff --git a/runsc/main.go b/runsc/main.go index b36100cca..0a2cbca6c 100644 --- a/runsc/main.go +++ b/runsc/main.go @@ -109,6 +109,10 @@ func main() { cmd.Fatalf("%v", err) } + if fsAccess == boot.FileAccessProxy && *overlay { + cmd.Fatalf("overlay flag is incompatible with proxy-shared file access") + } + netType, err := boot.MakeNetworkType(*network) if err != nil { cmd.Fatalf("%v", err) @@ -119,10 +123,6 @@ func main() { cmd.Fatalf("%v", err) } - if *fileAccess == "proxy" && *overlay { - cmd.Fatalf("overlay flag is incompatible with file-access=proxy") - } - // Create a new Config from the flags. conf := &boot.Config{ RootDir: *rootDir, |