change pivotdir default to mnt

The mnt directory has a good chance to already exist in the new root filesystem, so creation and removal can be avoided. This also eases use of read only root filesystems (no configuration necessary). Signed-off-by: Ferenc Wagner <wferi@niif.hu> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

change pivotdir default to mnt
3103609d · Ferenc Wagner · Daniel Lezcano · 64b90b3d · 3103609d · 3103609d
Commit 3103609d authored Jun 11, 2010 by Ferenc Wagner Committed by Daniel Lezcano Jun 11, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lxc.conf.sgml.in doc/lxc.conf.sgml.in +1 -1

conf.c src/lxc/conf.c +1 -1

No files found.
--- a/doc/lxc.conf.sgml.in
+++ b/doc/lxc.conf.sgml.in
@@ -416,7 +416,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 	    <para>
 	      where to pivot the original root file system under
 	      <option>lxc.rootfs</option>, specified relatively to
-	      that.  The default is <filename>oldrootfs</filename>.
+	      that.  The default is <filename>mnt</filename>.
 	      It is created if necessary, and also removed after
 	      unmounting everything from it during container setup.
 	    </para>

--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -545,7 +545,7 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
 	}

 	if (!pivotdir)
-		pivotdir = "oldrootfs";
+		pivotdir = "mnt";

 	/* create a default mountpoint if none specified */
 	snprintf(path, sizeof(path), "%s/%s", rootfs, pivotdir);