970b8d61a7
This brings in a fix for a cgroups setup race condition that we hit sometimes in the tests. Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
41 lines
921 B
Go
41 lines
921 B
Go
package libcontainer
|
|
|
|
import (
|
|
"os"
|
|
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
// mount initializes the console inside the rootfs mounting with the specified mount label
|
|
// and applying the correct ownership of the console.
|
|
func mountConsole(slavePath string) error {
|
|
oldMask := unix.Umask(0000)
|
|
defer unix.Umask(oldMask)
|
|
f, err := os.Create("/dev/console")
|
|
if err != nil && !os.IsExist(err) {
|
|
return err
|
|
}
|
|
if f != nil {
|
|
f.Close()
|
|
}
|
|
return unix.Mount(slavePath, "/dev/console", "bind", unix.MS_BIND, "")
|
|
}
|
|
|
|
// dupStdio opens the slavePath for the console and dups the fds to the current
|
|
// processes stdio, fd 0,1,2.
|
|
func dupStdio(slavePath string) error {
|
|
fd, err := unix.Open(slavePath, unix.O_RDWR, 0)
|
|
if err != nil {
|
|
return &os.PathError{
|
|
Op: "open",
|
|
Path: slavePath,
|
|
Err: err,
|
|
}
|
|
}
|
|
for _, i := range []int{0, 1, 2} {
|
|
if err := unix.Dup3(fd, i, 0); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|