remove pivotdir only if it was created by us

The removal does not account for possible leading path components that were also created during creation of pivotdir. Signed-off-by: Ferenc Wagner <wferi@niif.hu> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

remove pivotdir only if it was created by us
a91d897a · Ferenc Wagner · Daniel Lezcano · b1789442 · a91d897a
Commit a91d897a authored May 12, 2010 by Ferenc Wagner Committed by Daniel Lezcano May 12, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

conf.c src/lxc/conf.c +4 -2

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -464,6 +464,7 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
 	void *cbparm[2];
 	struct lxc_list mountlist, *iterator;
 	int ok, still_mounted, last_still_mounted;
+	int remove_pivotdir = 0;
 	/* change into new root fs */
 	if (chdir(rootfs)) {
@@ -484,6 +485,7 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
 			return -1;
 		}
+		remove_pivotdir = 1;
 		DEBUG("created '%s' directory", path);
 	}
@@ -573,8 +575,8 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
 	/* remove temporary mount point, we don't consider the removing
 	 * as fatal */
-	if (rmdir(pivotdir))
+	if (remove_pivotdir && rmdir(pivotdir))
-		WARN("can't remove mountpoint: %m");
+		WARN("can't remove mountpoint '%s': %m", pivotdir);
 	INFO("pivoted to '%s'", rootfs);
 	return 0;