From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Wed, 22 Jul 2009 17:39:18 +0000 (+0200)
Subject: Specify in the debian script an extra fstab file
X-Git-Tag: lxc_0_6_3~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd830f336a43913d80ada90082378a7c9f11e9eb;p=thirdparty%2Flxc.git

Specify in the debian script an extra fstab file

Allow the user to specify an extra fstab file to be added in the
debian configuration. So some optimisations can be done for sharing
objects.

eg: /var/cache/apt/archives mounted in <rootfs>/var/cache/apt/archives

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

diff --git a/scripts/lxc-debian.in b/scripts/lxc-debian.in
index 14aa071f3..b874d0462 100755
--- a/scripts/lxc-debian.in
+++ b/scripts/lxc-debian.in
@@ -5,7 +5,8 @@ CACHE="@LOCALSTATEDIR@/cache/lxc/debian"
 
 NAME="debian"
 CONFFILE="lxc.conf"
-MNTFILE="mount.conf"
+MNTFILE=
+TMPMNTFILE=
 UTSNAME=
 IPV4="172.20.0.21"
 GATEWAY="172.20.0.1"
@@ -135,7 +136,7 @@ lxc.network.flags = up
 lxc.network.link = br0
 lxc.network.name = eth0
 lxc.network.mtu = $MTU
-lxc.mount = $MNTFILE
+lxc.mount = $TMPMNTFILE
 lxc.rootfs = $ROOTFS
 lxc.cgroup.devices.deny = a
 # /dev/null and zero
@@ -157,9 +158,12 @@ EOF
 }
 
 write_lxc_mounts() {
-cat <<EOF > $MNTFILE
 
-EOF
+    TMPMNTFILE=$(mktemp lxc.XXXXXXXXXX)
+
+    if [ ! -z "$MNTFILE" ]; then
+	cp $MNTFILE $TMPMNTFILE
+    fi
 }
 
 collect_information() {
@@ -214,6 +218,13 @@ collect_information() {
     if [ ! -z "$_ROOTFS_" ]; then
 	ROOTFS=$_ROOTFS_
     fi
+
+    echo -n "Specify the location for an extra fstab file [(none)] "
+    read _MNTFILE_
+
+    if [ ! -z "$_MNTFILE_" ]; then
+	MNTFILE=$_MNTFILE_
+    fi
 }
 
 install_debian()
@@ -301,7 +312,7 @@ create() {
 
     # remove the configuration files
     rm -f $CONFFILE
-    rm -f $MNTFILE
+    rm -f $TMPMNTFILE
 
     if [ "$RES" != "0" ]; then
 	echo "Failed to create '$NAME'"