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

Merge pull request #4656 from crosbymichael/fix-ptmx-link

Browse source 
Always symlink /dev/ptmx for libcontainer
This commit is contained in:
Michael Crosby 2014-03-13 14:57:17 -07:00
commit aca132a1dd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libcontainer/nsinit/mount.go
View file

@ -64,10 +64,8 @@ func setupNewMountNamespace(rootfs string, bindMounts []libcontainer.Mount, cons
if err := setupDev(rootfs); err != nil { if err := setupDev(rootfs); err != nil {
return err return err
} }
if console != "" { if err := setupPtmx(rootfs, console); err != nil {
if err := setupPtmx(rootfs, console); err != nil { return err
return err
}
} }
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)
@ -263,8 +261,10 @@ func setupPtmx(rootfs, console string) error {
if err := os.Symlink("pts/ptmx", ptmx); err != nil { if err := os.Symlink("pts/ptmx", ptmx); err != nil {
return fmt.Errorf("symlink dev ptmx %s", err) return fmt.Errorf("symlink dev ptmx %s", err)
} }
if err := setupConsole(rootfs, console); err != nil { if console != "" {
return err if err := setupConsole(rootfs, console); err != nil {
return err
}
} }
return nil return nil
} }