Skip to content

L
lxc
Commit 70dd1397 by Michel Normand Committed by Daniel Lezcano
Options

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: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: 's avatarMichel Normand <michel_mno@laposte.net>
parent 3f4a86bf
Showing with 0 additions and 11 deletions
scripts/lxc-fedora.in
...@@ -7,7 +7,6 @@ CACHE="@LOCALSTATEDIR@/cache/lxc/${DISTRO}" ...@@ -7,7 +7,6 @@ CACHE="@LOCALSTATEDIR@/cache/lxc/${DISTRO}"
# Default container name # Default container name
NAME="fedora" NAME="fedora"
CONFFILE="lxc.conf" CONFFILE="lxc.conf"
MNTFILE="mount.conf"
UTSNAME= UTSNAME=
IPV4="172.20.0.21" IPV4="172.20.0.21"
GATEWAY="172.20.0.1" GATEWAY="172.20.0.1"
...@@ -138,7 +137,6 @@ lxc.network.flags = up ...@@ -138,7 +137,6 @@ 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.rootfs = ${ROOTFS} lxc.rootfs = ${ROOTFS}
lxc.cgroup.devices.deny = a lxc.cgroup.devices.deny = a
# /dev/null and zero # /dev/null and zero
...@@ -160,12 +158,6 @@ lxc.cgroup.devices.allow = c 254:0 rwm ...@@ -160,12 +158,6 @@ lxc.cgroup.devices.allow = c 254:0 rwm
EOF EOF
} }
write_lxc_mounts() {
cat <<EOF > ${MNTFILE}
EOF
}
create() { create() {
# choose a container name, default is already in shell NAME variable # choose a container name, default is already in shell NAME variable
...@@ -282,8 +274,6 @@ create() { ...@@ -282,8 +274,6 @@ create() {
) 200> "@LOCALSTATEDIR@/lock/subsys/lxc" ) 200> "@LOCALSTATEDIR@/lock/subsys/lxc"
fi fi
write_lxc_mounts
write_lxc_configuration write_lxc_configuration
write_distro_inittab write_distro_inittab
...@@ -303,7 +293,6 @@ RES=$? ...@@ -303,7 +293,6 @@ RES=$?
# remove the configuration files # remove the configuration files
rm -f ${CONFFILE} rm -f ${CONFFILE}
rm -f ${MNTFILE}
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