commit und geh weg

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / net / red / update

diff --git a/src/initscripts/init.d/net/red/update b/src/initscripts/init.d/net/red/update
index 2bb411f9c2b29b48e8fdce8453b64e325012cf07..342f6359c7f164557de253988b9410d834a6e529 100644 (file)
--- a/src/initscripts/init.d/net/red/update
+++ b/src/initscripts/init.d/net/red/update
@@ -37,8 +37,8 @@ IFACE=`cat /var/ipfire/red/iface 2>/dev/null | tr -d '\012'`
 REMOTE=`cat /var/ipfire/red/remote-ipaddress 2>/dev/null | tr -d '\012'`
 
 ### DNS Settings
-DNS1=`cat /var/ipfire/red/dns1 2>/dev/null | tr -d '\012'`
-DNS2=`cat /var/ipfire/red/dns2 2>/dev/null | tr -d '\012'`
+DNS1=`cat /var/ipfire/red/dns1 > /dev/null 2>&1 | tr -d '\012'`
+DNS2=`cat /var/ipfire/red/dns2 > /dev/null 2>&1 | tr -d '\012'`
 echo > /var/ipfire/red/resolv.conf             #clear it
 [ "$DNS1" != "" ] && echo "nameserver $DNS1" >  /var/ipfire/red/resolv.conf
 [ "$DNS2" != "" ] && echo "nameserver $DNS2" >> /var/ipfire/red/resolv.conf
@@ -79,7 +79,7 @@ if ( echo $0 | /bin/grep -q 'dhcpcd.exe' ); then
                        /usr/local/bin/setportfw
                        /usr/local/bin/setxtaccess
                        /usr/local/bin/setddns.pl -f
-                       /usr/local/bin/restartsnort red
+           /usr/local/bin/snortctrl restart
                        sleep $VPN_DELAYED_START && /usr/local/bin/ipsecctrl S &
                        /bin/rm -f /var/lock/red.lock
                        logger -p local0.info -t red[$$] "unlocking from $$"
@@ -100,7 +100,7 @@ if [ -e "/var/ipfire/red/active" ]; then
        /etc/rc.d/init.d/firewall reload
        /usr/local/bin/setfilters
        /usr/local/bin/outgoingfwctrl
-       /usr/local/bin/restartsnort red
+       /usr/local/bin/snortctrl restart
        /usr/local/bin/qosctrl start
        /usr/local/bin/setportfw
        /usr/local/bin/setxtaccess