Merge branch 'pruiz-fix-initrc-no-table'

changes/61/8861/1
Richard Fuchs 11 years ago
commit e595701bc6

@ -70,6 +70,7 @@ case "$1" in
start) start)
echo -n "Starting $DESC: $NAME" echo -n "Starting $DESC: $NAME"
if [ $TABLE -ge 0 ]; then \
set +e set +e
modprobe xt_MEDIAPROXY modprobe xt_MEDIAPROXY
echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null
@ -84,6 +85,7 @@ case "$1" in
ip6tables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null ip6tables -D mediaproxy -p udp -j MEDIAPROXY --id $TABLE 2>/dev/null
ip6tables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE ip6tables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE
set -e set -e
fi
start-stop-daemon --start --quiet --pidfile $PIDFILE \ start-stop-daemon --start --quiet --pidfile $PIDFILE \
--exec $DAEMON -- $OPTIONS || echo -n " already running" --exec $DAEMON -- $OPTIONS || echo -n " already running"
log_end_msg $? log_end_msg $?
@ -95,6 +97,7 @@ case "$1" in
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
return $? return $?
fi fi
if [ $TABLE -ge 0 ]; then \
set +e set +e
echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null echo "del $TABLE" > /proc/mediaproxy/control 2>/dev/null
iptables -D INPUT -j mediaproxy 2> /dev/null iptables -D INPUT -j mediaproxy 2> /dev/null
@ -104,6 +107,7 @@ case "$1" in
rmmod ipt_MEDIAPROXY 2>/dev/null rmmod ipt_MEDIAPROXY 2>/dev/null
rmmod xt_MEDIAPROXY 2>/dev/null rmmod xt_MEDIAPROXY 2>/dev/null
set -e set -e
fi
rm -f $PIDFILE rm -f $PIDFILE
log_end_msg $? log_end_msg $?
;; ;;
@ -116,6 +120,7 @@ case "$1" in
return $? return $?
fi fi
rm -f $PIDFILE rm -f $PIDFILE
if [ $TABLE -ge 0 ]; then \
sleep 1 sleep 1
set +e set +e
if [ -e /proc/mediaproxy/control ]; then if [ -e /proc/mediaproxy/control ]; then
@ -135,6 +140,7 @@ case "$1" in
ip6tables -I INPUT -j mediaproxy ip6tables -I INPUT -j mediaproxy
ip6tables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE ip6tables -I mediaproxy -p udp -j MEDIAPROXY --id $TABLE
set -e set -e
fi
start-stop-daemon --start --quiet --pidfile \ start-stop-daemon --start --quiet --pidfile \
$PIDFILE --exec $DAEMON -- $OPTIONS $PIDFILE --exec $DAEMON -- $OPTIONS
log_end_msg $? log_end_msg $?

Loading…
Cancel
Save