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 83e01d5e5f3712efb8133ea210b88ce553014265..8f3f633b01698774962f8c8e3a9936d0e3584ed1 100644 (file)
--- 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 54e5f221726c5f853200f6d1e7a6a5e13a4b351e..2ac522590c3f4ad2f3fcd03488cbeb15936238b4 100644 (file)
--- 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 (file)
index 0000000..98fb0e0
--- /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 (file)
index 0000000..2d94ec1
--- /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