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>

Specify in the debian script an extra fstab file
cd830f33 · Daniel Lezcano · Daniel Lezcano · 246091b9 · cd830f33
Commit cd830f33 authored Jul 22, 2009 by Daniel Lezcano Committed by Daniel Lezcano Jul 22, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 5 deletions

lxc-debian.in scripts/lxc-debian.in +16 -5

No files found.
--- 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'"