vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #4512 from crosbymichael/no-pivot-root

Browse source 
No pivot root because of ramdisk
This commit is contained in:
unclejack 2014-03-07 02:54:03 +02:00
commit 0718fb409c
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libcontainer/nsinit/mount.go
View file

@ -5,7 +5,6 @@ package nsinit
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/system"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"syscall" "syscall"
@ -21,7 +20,7 @@ const defaultMountFlags = syscall.MS_NOEXEC | syscall.MS_NOSUID | syscall.MS_NOD
// is no longer in use, the mounts will be removed automatically // is no longer in use, the mounts will be removed automatically
func setupNewMountNamespace(rootfs, console string, readonly bool) error { func setupNewMountNamespace(rootfs, console string, readonly bool) error {
// mount as slave so that the new mounts do not propagate to the host // mount as slave so that the new mounts do not propagate to the host
if err := system.Mount("", "/", "", syscall.MS_PRIVATE|syscall.MS_REC, ""); err != nil { if err := system.Mount("", "/", "", syscall.MS_SLAVE|syscall.MS_REC, ""); err != nil {
return fmt.Errorf("mounting / as slave %s", err) return fmt.Errorf("mounting / as slave %s", err)
} }
if err := system.Mount(rootfs, rootfs, "bind", syscall.MS_BIND|syscall.MS_REC, ""); err != nil { if err := system.Mount(rootfs, rootfs, "bind", syscall.MS_BIND|syscall.MS_REC, ""); err != nil {
@ -51,29 +50,16 @@ func setupNewMountNamespace(rootfs, console string, readonly bool) error {
if err := system.Chdir(rootfs); err != nil { if err := system.Chdir(rootfs); err != nil {
return fmt.Errorf("chdir into %s %s", rootfs, err) return fmt.Errorf("chdir into %s %s", rootfs, err)
} }
if err := system.Mount(rootfs, "/", "", syscall.MS_MOVE, ""); err != nil {
pivotDir, err := ioutil.TempDir(rootfs, ".pivot_root") return fmt.Errorf("mount move %s into / %s", rootfs, err)
if err != nil {
return fmt.Errorf("can't create pivot_root dir %s", pivotDir, err)
} }
if err := system.Pivotroot(rootfs, pivotDir); err != nil { if err := system.Chroot("."); err != nil {
return fmt.Errorf("pivot_root %s", err) return fmt.Errorf("chroot . %s", err)
} }
if err := system.Chdir("/"); err != nil { if err := system.Chdir("/"); err != nil {
return fmt.Errorf("chdir / %s", err) return fmt.Errorf("chdir / %s", err)
} }
// path to pivot dir now changed, update
pivotDir = filepath.Join("/", filepath.Base(pivotDir))
if err := system.Unmount(pivotDir, syscall.MNT_DETACH); err != nil {
return fmt.Errorf("unmount pivot_root dir %s", err)
}
if err := os.Remove(pivotDir); err != nil {
return fmt.Errorf("remove pivot_root dir %s", err)
}
system.Umask(0022) system.Umask(0022)
return nil return nil