Merge pull request #796 from rhatdan/relabeldev

Mrunal Patel · Mrunal Patel · commit 89c3c97a8482 · 2016-05-02T09:50:26.000-07:00
Need to make sure labels applied to /dev
diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
@@ -69,6 +69,9 @@ func setupRootfs(config *configs.Config, console *linuxConsole, pipe io.ReadWrit
 		if err := setupDevSymlinks(config.Rootfs); err != nil {
 			return newSystemErrorWithCause(err, "setting up /dev symlinks")
 		}
+		if err := label.Relabel(filepath.Join(config.Rootfs, "dev"), config.MountLabel, false); err != nil {
+			return err
+		}
 	}
 	// Signal the parent to run the pre-start hooks.
 	// The hooks are run after the mounts are setup, but before we switch to the new

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ func setupRootfs(config configs.Config, console linuxConsole, pipe io.ReadWrit`
`69`	`69`	`if err := setupDevSymlinks(config.Rootfs); err != nil {`
`70`	`70`	`return newSystemErrorWithCause(err, "setting up /dev symlinks")`
`71`	`71`	`}`
	`72`	`+ if err := label.Relabel(filepath.Join(config.Rootfs, "dev"), config.MountLabel, false); err != nil {`
	`73`	`+ return err`
	`74`	`+ }`
`72`	`75`	`}`
`73`	`76`	`// Signal the parent to run the pre-start hooks.`
`74`	`77`	`// The hooks are run after the mounts are setup, but before we switch to the new`