Commit cd830f33 by Daniel Lezcano Committed by Daniel Lezcano

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: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 246091b9
...@@ -5,7 +5,8 @@ CACHE="@LOCALSTATEDIR@/cache/lxc/debian" ...@@ -5,7 +5,8 @@ CACHE="@LOCALSTATEDIR@/cache/lxc/debian"
NAME="debian" NAME="debian"
CONFFILE="lxc.conf" CONFFILE="lxc.conf"
MNTFILE="mount.conf" MNTFILE=
TMPMNTFILE=
UTSNAME= UTSNAME=
IPV4="172.20.0.21" IPV4="172.20.0.21"
GATEWAY="172.20.0.1" GATEWAY="172.20.0.1"
...@@ -135,7 +136,7 @@ lxc.network.flags = up ...@@ -135,7 +136,7 @@ lxc.network.flags = up
lxc.network.link = br0 lxc.network.link = br0
lxc.network.name = eth0 lxc.network.name = eth0
lxc.network.mtu = $MTU lxc.network.mtu = $MTU
lxc.mount = $MNTFILE lxc.mount = $TMPMNTFILE
lxc.rootfs = $ROOTFS lxc.rootfs = $ROOTFS
lxc.cgroup.devices.deny = a lxc.cgroup.devices.deny = a
# /dev/null and zero # /dev/null and zero
...@@ -157,9 +158,12 @@ EOF ...@@ -157,9 +158,12 @@ EOF
} }
write_lxc_mounts() { write_lxc_mounts() {
cat <<EOF > $MNTFILE
EOF TMPMNTFILE=$(mktemp lxc.XXXXXXXXXX)
if [ ! -z "$MNTFILE" ]; then
cp $MNTFILE $TMPMNTFILE
fi
} }
collect_information() { collect_information() {
...@@ -214,6 +218,13 @@ collect_information() { ...@@ -214,6 +218,13 @@ collect_information() {
if [ ! -z "$_ROOTFS_" ]; then if [ ! -z "$_ROOTFS_" ]; then
ROOTFS=$_ROOTFS_ ROOTFS=$_ROOTFS_
fi fi
echo -n "Specify the location for an extra fstab file [(none)] "
read _MNTFILE_
if [ ! -z "$_MNTFILE_" ]; then
MNTFILE=$_MNTFILE_
fi
} }
install_debian() install_debian()
...@@ -301,7 +312,7 @@ create() { ...@@ -301,7 +312,7 @@ create() {
# remove the configuration files # remove the configuration files
rm -f $CONFFILE rm -f $CONFFILE
rm -f $MNTFILE rm -f $TMPMNTFILE
if [ "$RES" != "0" ]; then if [ "$RES" != "0" ]; then
echo "Failed to create '$NAME'" echo "Failed to create '$NAME'"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment