瀏覽代碼

Merge pull request #4993 from crosbymichael/remove-loopback-setup

Remove loopback setup for native driver
Michael Crosby 11 年之前
父節點
當前提交
afc56e8d6d
共有 1 個文件被更改,包括 0 次插入15 次删除
  1. 0 15
      pkg/libcontainer/nsinit/mount.go

+ 0 - 15
pkg/libcontainer/nsinit/mount.go

@@ -55,8 +55,6 @@ func setupNewMountNamespace(rootfs string, bindMounts []libcontainer.Mount, cons
 	if err := copyDevNodes(rootfs); err != nil {
 	if err := copyDevNodes(rootfs); err != nil {
 		return fmt.Errorf("copy dev nodes %s", err)
 		return fmt.Errorf("copy dev nodes %s", err)
 	}
 	}
-	// In non-privileged mode, this fails. Discard the error.
-	setupLoopbackDevices(rootfs)
 	if err := setupPtmx(rootfs, console, mountLabel); err != nil {
 	if err := setupPtmx(rootfs, console, mountLabel); err != nil {
 		return err
 		return err
 	}
 	}
@@ -142,19 +140,6 @@ func copyDevNodes(rootfs string) error {
 	return nil
 	return nil
 }
 }
 
 
-func setupLoopbackDevices(rootfs string) error {
-	for i := 0; ; i++ {
-		if err := copyDevNode(rootfs, fmt.Sprintf("loop%d", i)); err != nil {
-			if !os.IsNotExist(err) {
-				return err
-			}
-			break
-		}
-
-	}
-	return nil
-}
-
 func copyDevNode(rootfs, node string) error {
 func copyDevNode(rootfs, node string) error {
 	stat, err := os.Stat(filepath.Join("/dev", node))
 	stat, err := os.Stat(filepath.Join("/dev", node))
 	if err != nil {
 	if err != nil {