From: Michel Normand <michel.mno@free.fr>
Date: Fri, 13 Nov 2009 10:48:29 +0000 (+0100)
Subject: lxc: remove lxc.mount setting in lxc-fedora script
X-Git-Tag: lxc_0_6_4~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70dd139727aa74f82b0405ed476343ab8b0343d9;p=thirdparty%2Flxc.git

lxc: remove lxc.mount setting in lxc-fedora script

This script do not use extract fstab (as done by lxc-debian)
so there is no reason to set the lxc.mount key in config file.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Michel Normand <michel_mno@laposte.net>
---

diff --git a/scripts/lxc-fedora.in b/scripts/lxc-fedora.in
index 54d7c746b..7d7a6c52e 100644
--- a/scripts/lxc-fedora.in
+++ b/scripts/lxc-fedora.in
@@ -7,7 +7,6 @@ CACHE="@LOCALSTATEDIR@/cache/lxc/${DISTRO}"
 # Default container name
 NAME="fedora"
 CONFFILE="lxc.conf"
-MNTFILE="mount.conf"
 UTSNAME=
 IPV4="172.20.0.21"
 GATEWAY="172.20.0.1"
@@ -138,7 +137,6 @@ lxc.network.flags = up
 lxc.network.link = br0
 lxc.network.name = eth0
 lxc.network.mtu = ${MTU}
-lxc.mount = ${MNTFILE}
 lxc.rootfs = ${ROOTFS}
 lxc.cgroup.devices.deny = a
 # /dev/null and zero
@@ -160,12 +158,6 @@ lxc.cgroup.devices.allow = c 254:0 rwm
 EOF
 }
 
-write_lxc_mounts() {
-cat <<EOF > ${MNTFILE}
-
-EOF
-}
-
 create() {
 
     # choose a container name, default is already in shell NAME variable
@@ -282,8 +274,6 @@ create() {
 	) 200> "@LOCALSTATEDIR@/lock/subsys/lxc"
     fi
 
-write_lxc_mounts
-
 write_lxc_configuration
 
 write_distro_inittab
@@ -303,7 +293,6 @@ RES=$?
 
 # remove the configuration files
 rm -f ${CONFFILE}
-rm -f ${MNTFILE}
 
 if [ "${RES}" != "0" ]; then
     echo "Failed to create '${NAME}'"