Skip to content

L
lxc
Unverified Commit a262569c by Stéphane Graber
Options

upstart: Fix wrong stderr redirect

Signed-off-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent e8ea3116
Showing with 2 additions and 2 deletions
config/init/upstart/lxc-net.conf
...@@ -21,7 +21,7 @@ pre-start script ...@@ -21,7 +21,7 @@ pre-start script
[ "x$USE_LXC_BRIDGE" = "xtrue" ] || { stop; exit 0; } [ "x$USE_LXC_BRIDGE" = "xtrue" ] || { stop; exit 0; }
use_iptables_lock="-w" use_iptables_lock="-w"
iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock="" iptables -w -L -n > /dev/null 2>&1 || use_iptables_lock=""
cleanup() { cleanup() {
# dnsmasq failed to start, clean up the bridge # dnsmasq failed to start, clean up the bridge
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
...@@ -74,7 +74,7 @@ post-stop script ...@@ -74,7 +74,7 @@ post-stop script
if [ -d /sys/class/net/${LXC_BRIDGE} ]; then if [ -d /sys/class/net/${LXC_BRIDGE} ]; then
use_iptables_lock="-w" use_iptables_lock="-w"
iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock="" iptables -w -L -n > /dev/null 2>&1 || use_iptables_lock=""
ifconfig ${LXC_BRIDGE} down ifconfig ${LXC_BRIDGE} down
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
......
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