From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Thu, 27 May 2010 12:27:13 +0000 (+0200)
Subject: change the rootfs mount location and add the README
X-Git-Tag: lxc-0.7.0~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baf6671fd3847865da9b64dc8f8be85d81304840;p=thirdparty%2Flxc.git

change the rootfs mount location and add the README

Previous path was $libdir/lxc, changed to $libdir/lxc/rootfs.
Added a README file to be placed in this directory, describing
the purpose of this empty directory. Having a file to be installed
in this directory makes the Makefile to automatically create the
directory at install time.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/configure.ac b/configure.ac
index 83e01d5e5..8f3f633b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_ARG_WITH([rootfs-path],
 	[AC_HELP_STRING(
 		[--with-rootfs-path=dir],
 		[lxc rootfs mount point]
-	)], [], [with_rootfs_path="${libdir}/lxc"])
+	)], [], [with_rootfs_path="${libdir}/lxc/rootfs"])
 
 AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
 AS_AC_EXPAND(LXCPATH, "${with_config_path}")
@@ -119,6 +119,8 @@ AC_CONFIG_FILES([
 	doc/common_options.sgml
 	doc/see_also.sgml
 
+	doc/rootfs/Makefile
+
 	doc/examples/Makefile
 	doc/examples/lxc-macvlan.conf
 	doc/examples/lxc-vlan.conf
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 54e5f2217..2ac522590 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = examples
-DIST_SUBDIRS = examples
+SUBDIRS = examples rootfs
+DIST_SUBDIRS = examples rootfs
 
 EXTRA_DIST = \
 	FAQ.txt \
diff --git a/doc/rootfs/Makefile.am b/doc/rootfs/Makefile.am
new file mode 100644
index 000000000..98fb0e07a
--- /dev/null
+++ b/doc/rootfs/Makefile.am
@@ -0,0 +1,3 @@
+READMEdir=@LXCROOTFSMOUNT@
+
+README_DATA=README
\ No newline at end of file
diff --git a/doc/rootfs/README b/doc/rootfs/README
new file mode 100644
index 000000000..2d94ec13a
--- /dev/null
+++ b/doc/rootfs/README
@@ -0,0 +1,4 @@
+This directory must exist, even though no contents are ever placed
+here. It is used to temporary mount the rootfs of lxc in a private
+mount namespace only visible by the processes running in the
+container.
\ No newline at end of file