From 069f1edbe42ebd91800f9b35e8724babc4081613 Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Thu, 19 Mar 2020 20:17:03 -0700 Subject: Improve error message when pivot_root fails PiperOrigin-RevId: 301949722 --- runsc/cmd/chroot.go | 2 +- runsc/cmd/gofer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'runsc') 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") -- cgit v1.2.3