kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Make sure proc is umounted for chroot driver within init 

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-01-13 17:55:16 -08:00
parent 8c9f62d037
commit d3bae131d6
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sysinit/sysinit.go
View File

@ -208,11 +208,10 @@ func executeProgram(args *DockerInitArgs) error {
return err
}
} else if args.driver == "chroot" {
// TODO: @crosbymichael @creack how do we unmount this after the
// process exists?
if err := setupMounts(args); err != nil {
return err
}
defer mount.ForceUnmount("proc")
}
path, err := exec.LookPath(args.args[0])
@ -221,11 +220,22 @@ func executeProgram(args *DockerInitArgs) error {
os.Exit(127)
}
if err := syscall.Exec(path, args.args, os.Environ()); err != nil {
return fmt.Errorf("dockerinit unable to execute %s - %s", path, err)
}
if args.driver == "lxc" {
if err := syscall.Exec(path, args.args, os.Environ()); err != nil {
panic(err)
}
// Will never reach
} else if args.driver == "chroot" {
cmd := exec.Command(path, args.args[1:]...)
cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout
cmd.Stdin = os.Stdin
return cmd.Run()
}
panic("Should not be here")
// Will never reach here
return nil
}