Sorry, that patch was incorrect. Fixed version attached.
--
The virus contained in this message was not detected.
http://niall.donegan.tel
--- vz.orig 2011-04-27 13:37:05.000000000 +0100
+++ vz 2011-04-27 15:15:26.000000000 +0100
@@ -40,17 +40,9 @@
. /usr/lib/vzctl/scripts/initd-functions
-VZQUOTA=/usr/sbin/vzquota
-CONFIG_DIR=/etc/vz/conf
-LOCKFILE=$VARLOCK/vz_lock
-SUBSYS_VZ=$VARLOCK/vz
-VESTAT=/proc/vz/vestat
-# VZDEV=venet0
-PRELOAD_MODULES=
-MODULES=
-MODULES_OTHER=
-NET_MODULES=
-IPT_MODULES=
+if [ -f /etc/default/vz ] ; then
+ . /etc/default/vz
+fi
if [ "${MODULES_DISABLED}" != "yes" ]; then
PRELOAD_MODULES="af_packet"
@@ -59,7 +51,10 @@
MODULES_OTHER="vzcompat ${CPT_MODULES}"
VNET_MODULES="vznetdev vznet"
VETH_MODULES="vzethdev"
- NET_MODULES="${VNET_MODULES} ${VETH_MODULES}"
+ NET_MODULES="${VETH_MODULES}"
+ if [ -n "${VZDEV}" ]; then
+ NET_MODULES="${NET_MODULES} ${VNET_MODULES}"
+ fi
if [ "${VZWDOG}" = "yes" ]; then
MODULES="${MODULES} vzwdog"
fi
@@ -182,14 +177,16 @@
if [ -z "$VEINFO" ]; then
return 0
fi
- __echo "Bringing up interface $VZDEV: "
- ip link set $VZDEV up
- print_result
- ip addr add 0.0.0.0/0 dev $VZDEV
- if [ "${IPV6}" = "yes" ]; then
- ip -6 addr add fe80::1/128 dev $VZDEV
+ if [ -n "$VZDEV" ]; then
+ __echo "Bringing up interface $VZDEV: "
+ ip link set $VZDEV up
+ print_result
+ ip addr add 0.0.0.0/0 dev $VZDEV
+ if [ "${IPV6}" = "yes" ]; then
+ ip -6 addr add fe80::1/128 dev $VZDEV
+ fi
+ sysctl -q -w net.ipv4.conf.$VZDEV.send_redirects=0
fi
- sysctl -q -w net.ipv4.conf.$VZDEV.send_redirects=0
if [ "$(sysctl -n -e net.ipv4.ip_forward)" != "1" ]; then
print_warning "IP forwarding is not enabled"
fi
@@ -198,11 +195,13 @@
stop_net()
{
local mod
-
- if ip addr list | grep -q "venet0:.*UP" 2>/dev/null; then
- __echo "Bringing down interface $VZDEV: "
- ip link set $VZDEV down
- print_result
+
+ if [ -n "$VZDEV" ]; then
+ if ip addr list | grep -q "venet0:.*UP" 2>/dev/null; then
+ __echo "Bringing down interface $VZDEV: "
+ ip link set $VZDEV down
+ print_result
+ fi
fi
for mod in ${NET_MODULES}; do
/sbin/modprobe -r ${mod} > /dev/null 2>&1
