diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-20 03:21:16 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-20 03:21:16 +0000 |
| commit | 92d8a430177f983d52fa20a70656e315da035721 (patch) | |
| tree | fba33b9f80b72ec5a285f9727966e6f67b839e1b /runsc/cmd | |
| parent | 9512d262432c8c0d55f4eba200cc1a952689247c (diff) | |
| parent | 069f1edbe42ebd91800f9b35e8724babc4081613 (diff) | |
Merge release-20200219.0-210-g069f1ed (automated)
Diffstat (limited to 'runsc/cmd')
| -rw-r--r-- | runsc/cmd/chroot.go | 2 | ||||
| -rw-r--r-- | runsc/cmd/gofer.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runsc/cmd/chroot.go b/runsc/cmd/chroot.go index b5a0ce17d..189244765 100644 --- a/runsc/cmd/chroot.go +++ b/runsc/cmd/chroot.go @@ -50,7 +50,7 @@ func pivotRoot(root string) error { // new_root, so after umounting the old_root, we will see only // the new_root in "/". if err := syscall.PivotRoot(".", "."); err != nil { - return fmt.Errorf("error changing root filesystem: %v", err) + return fmt.Errorf("pivot_root failed, make sure that the root mount has a parent: %v", err) } if err := syscall.Unmount(".", syscall.MNT_DETACH); err != nil { diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go index 6e06f3c0f..02e5af3d3 100644 --- a/runsc/cmd/gofer.go +++ b/runsc/cmd/gofer.go @@ -335,7 +335,7 @@ func setupRootFS(spec *specs.Spec, conf *boot.Config) error { if !conf.TestOnlyAllowRunAsCurrentUserWithoutChroot { if err := pivotRoot("/proc"); err != nil { - Fatalf("faild to change the root file system: %v", err) + Fatalf("failed to change the root file system: %v", err) } if err := os.Chdir("/"); err != nil { Fatalf("failed to change working directory") |