runsc: Fix instances of file access "proxy".
This file access type is actually called "proxy-shared", but I forgot to update all locations. PiperOrigin-RevId: 208832491 Change-Id: I7848bc4ec2478f86cf2de1dcd1bfb5264c6276de
This commit is contained in:
parent
a620bea045
commit
2033f61aae
|
@ -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:
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue