[lxc-devel] [PATCH 1/2] change pivotdir default to mnt

[Ferenc Wagner]

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 at niif.hu>
---
 doc/lxc.conf.sgml.in |    2 +-
 src/lxc/conf.c       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
index 6c98714..578d279 100644
--- a/doc/lxc.conf.sgml.in
+++ b/doc/lxc.conf.sgml.in
@@ -413,7 +413,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>
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 9565d91..5968882 100644
--- 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);
-- 
1.6.5