Merge pull request #1438 from hqhq/fix_rootfs_comments

Fix comments about when to pivot_root

Author: crosbymichael

libcontainer/rootfs_linux.go

@@ -37,9 +37,8 @@ func needsSetupDev(config *configs.Config) bool {
 }
 
 // prepareRootfs sets up the devices, mount points, and filesystems for use
-// inside a new mount namespace. It doesn't set anything as ro or pivot_root,
-// because console setup happens inside the caller. You must call
-// finalizeRootfs in order to finish the rootfs setup.
+// inside a new mount namespace. It doesn't set anything as ro. You must call
+// finalizeRootfs after this function to finish setting up the rootfs.
 func prepareRootfs(pipe io.ReadWriter, config *configs.Config) (err error) {
 	if err := prepareRoot(config); err != nil {
 		return newSystemErrorWithCause(err, "preparing rootfs")
@@ -114,8 +113,8 @@ func prepareRootfs(pipe io.ReadWriter, config *configs.Config) (err error) {
 	return nil
 }
 
-// finalizeRootfs actually switches the root of the process and sets anything
-// to ro if necessary. You must call prepareRootfs first.
+// finalizeRootfs sets anything to ro if necessary. You must call
+// prepareRootfs first.
 func finalizeRootfs(config *configs.Config) (err error) {
 	// remount dev as ro if specified
 	for _, m := range config.Mounts {