From e1c4f6234729c1898d90ab16b260b83f6554db90 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 16 May 2012 13:01:38 +0000
Subject: [PATCH] the init script shall not die upon kernel module failure

---
 debian/ngcp-mediaproxy-ng-daemon.init | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/ngcp-mediaproxy-ng-daemon.init b/debian/ngcp-mediaproxy-ng-daemon.init
index 560ed36c8..b93495d3b 100755
--- a/debian/ngcp-mediaproxy-ng-daemon.init
+++ b/debian/ngcp-mediaproxy-ng-daemon.init
@@ -66,15 +66,15 @@ case "$1" in
   start)
 
 	echo -n "Starting $DESC: $NAME"
-	modprobe xt_MEDIAPROXY
         set +e
+	modprobe xt_MEDIAPROXY
 	echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null
 	iptables -D INPUT -j MEDIAPROXY --id $TABLE 2>/dev/null
 	iptables -D INPUT -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
 	ip6tables -D INPUT -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
-	set -e
 	iptables -I INPUT -p udp -j MEDIAPROXY --id $TABLE
 	ip6tables -I INPUT -p udp -j MEDIAPROXY --id $TABLE
+	set -e
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
 		--exec $DAEMON -- $OPTIONS || echo -n " already running"
 	log_end_msg $?
@@ -116,10 +116,10 @@ case "$1" in
 	ip6tables -D INPUT -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
 	rmmod ipt_MEDIAPROXY 2>/dev/null
 	rmmod xt_MEDIAPROXY 2>/dev/null
-	set -e
 	modprobe xt_MEDIAPROXY
 	iptables -I INPUT -p udp -j MEDIAPROXY --id $TABLE
 	ip6tables -I INPUT -p udp -j MEDIAPROXY --id $TABLE
+	set -e
 	start-stop-daemon --start --quiet --pidfile \
 		$PIDFILE --exec $DAEMON  -- $OPTIONS
 	log_end_msg $?