diff options
Diffstat (limited to 'runsc/container')
| -rw-r--r-- | runsc/container/container.go | 5 | ||||
| -rw-r--r-- | runsc/container/container_test.go | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/runsc/container/container.go b/runsc/container/container.go index 5977fbd21..9a05a1dc5 100644 --- a/runsc/container/container.go +++ b/runsc/container/container.go @@ -615,11 +615,6 @@ func (c *Container) waitForStopped() error { } func (c *Container) createGoferProcess(spec *specs.Spec, conf *boot.Config, bundleDir string) ([]*os.File, error) { - if conf.FileAccess == boot.FileAccessDirect { - // Don't start a gofer. The sandbox will access host FS directly. - return nil, nil - } - if err := setupFS(spec, conf, bundleDir); err != nil { return nil, fmt.Errorf("failed to setup mounts: %v", err) } diff --git a/runsc/container/container_test.go b/runsc/container/container_test.go index 9a94347b6..c45eb79a3 100644 --- a/runsc/container/container_test.go +++ b/runsc/container/container_test.go @@ -241,7 +241,7 @@ func configs(opts ...configOption) []*boot.Config { } c.Platform = boot.PlatformKVM case nonExclusiveFS: - c.FileAccess = boot.FileAccessProxy + c.FileAccess = boot.FileAccessShared default: panic(fmt.Sprintf("unknown config option %v", o)) @@ -1368,10 +1368,10 @@ func TestAbbreviatedIDs(t *testing.T) { // Check that modifications to a volume mount are propigated into and out of // the sandbox. func TestContainerVolumeContentsShared(t *testing.T) { - // Only run this test with shared proxy, since that is the only + // Only run this test with shared file access, since that is the only // behavior it is testing. conf := testutil.TestConfig() - conf.FileAccess = boot.FileAccessProxy + conf.FileAccess = boot.FileAccessShared t.Logf("Running test with conf: %+v", conf) // Main process just sleeps. We will use "exec" to probe the state of |