From f99f51db37df1d7e57604240d4adde98274b2958 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 1 Apr 2014 00:28:44 +0000 Subject: [PATCH] remove setupDev from libcontainer Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- nsinit/mount.go | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/nsinit/mount.go b/nsinit/mount.go index 796143c6..59f4a0e0 100644 --- a/nsinit/mount.go +++ b/nsinit/mount.go @@ -62,9 +62,6 @@ func setupNewMountNamespace(rootfs string, bindMounts []libcontainer.Mount, cons } // In non-privileged mode, this fails. Discard the error. setupLoopbackDevices(rootfs) - if err := setupDev(rootfs); err != nil { - return err - } if err := setupPtmx(rootfs, console, mountLabel); err != nil { return err } @@ -172,30 +169,6 @@ func copyDevNode(rootfs, node string) error { return nil } -// setupDev symlinks the current processes pipes into the -// appropriate destination on the containers rootfs -func setupDev(rootfs string) error { - for _, link := range []struct { - from string - to string - }{ - {"/proc/kcore", "/dev/core"}, - {"/proc/self/fd", "/dev/fd"}, - {"/proc/self/fd/0", "/dev/stdin"}, - {"/proc/self/fd/1", "/dev/stdout"}, - {"/proc/self/fd/2", "/dev/stderr"}, - } { - dest := filepath.Join(rootfs, link.to) - if err := os.Remove(dest); err != nil && !os.IsNotExist(err) { - return fmt.Errorf("remove %s %s", dest, err) - } - if err := os.Symlink(link.from, dest); err != nil { - return fmt.Errorf("symlink %s %s", dest, err) - } - } - return nil -} - // setupConsole ensures that the container has a proper /dev/console setup func setupConsole(rootfs, console string, mountLabel string) error { oldMask := system.Umask(0000)