mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

go: fmt

Browse Source 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
This commit is contained in:
Andrey Vagin
2015-03-25 17:59:20 +03:00
committed by Michael Crosby
parent 9212f68293
commit f705221b4a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container_linux.go
+8 -8
View File
@@ -295,7 +295,7 @@ func (c *linuxContainer) Checkpoint() error {
"--ext-mount-map", fmt.Sprintf("%s:%s", m.Destination, m.Destination))
}
}
addArgsFromEnv("CRIU_C", &args) // XXX debug
addArgsFromEnv("CRIU_C", &args) // XXX debug
if err := exec.Command(c.criuPath, args...).Run(); err != nil {
return err
}
@@ -337,16 +337,16 @@ func (c *linuxContainer) Restore(process *Process) error {
args = append(args, "--inherit-fd", fmt.Sprintf("fd[%d]:%s", i, s))
}
}
addArgsFromEnv("CRIU_R", &args) // XXX debug
addArgsFromEnv("CRIU_R", &args) // XXX debug
// XXX This doesn't really belong here as our caller should have
// already set up root (including devices) and mounted it.
/*
// remount root for restore
if err := syscall.Mount(c.config.Rootfs, c.config.Rootfs, "bind", syscall.MS_BIND|syscall.MS_REC, ""); err != nil {
return err
}
*/
/*
// remount root for restore
if err := syscall.Mount(c.config.Rootfs, c.config.Rootfs, "bind", syscall.MS_BIND|syscall.MS_REC, ""); err != nil {
return err
}
*/
defer syscall.Unmount(c.config.Rootfs, syscall.MNT_DETACH)
cmd := exec.Command(c.criuPath, args...)
nsinit/restore.go
+2 -2
View File
@@ -28,9 +28,9 @@ var restoreCommand = cli.Command{
}
//rootuid, err := config.HostUID()
//if err != nil {
//fatal(err)
//fatal(err)
//}
rootuid := 0 // XXX
rootuid := 0 // XXX
tty, err := newTty(context, process, rootuid)
if err != nil {
fatal(err)