Netzwerkscripts: DHCP vollstaendig getestet und gefixt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@790 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 583e55ea2c3b1e3c6dade0331870e83b0eafc6cb..78b7879ad2f02f6ee1e7cc2fa3aaf24369571669 100644 (file)
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -15,16 +15,33 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+SHOW_SRV=1
+
 case "${1}" in
        start)
                boot_mesg "Starting Domain Name Service Proxy..."
                
                eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
                ARGS=
-               [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN "
-               [ -e "/var/ipfire/red/active" ] && ARGS+="-r /var/ipfire/red/resolv.conf"
+               [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+               
+               echo > /var/ipfire/red/resolv.conf # Clear it
+               if [ -e "/var/ipfire/red/dns1" ]; then
+                   DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null)
+                   echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf
+               fi
+               if [ -e "/var/ipfire/red/dns2" ]; then
+                   DNS2=$(cat /var/ipfire/red/dns2 2>/dev/null)
+                   echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf
+               fi
+               [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"
                
                loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
+               
+               if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then
+                   boot_mesg "Using DNS server(s): ${DNS1} ${DNS2}"
+                   boot_mesg_flush
+               fi
                ;;
 
        stop)

diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index 5349960cb233fc2845153abc51b4c6b8fa82f87b..dca1b8339965e8f0d216cb5b3e6b7ebe782f8450 100644 (file)
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -21,7 +21,6 @@ case "$2" in
        new)    
                logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with new IP=${IPADDR}"
                [ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active
-               fi
                ;;
        down)
                logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been brought down"

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index d28fd9060a1f8c2cc21739530f4b480f62fcedfa..465d528cc84ab634f2a02d9129791d428f22bb90 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -278,6 +278,7 @@ case "${1}" in
                        fi
                fi
                
+               rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
                for i in $( ls -v ${rc_base}/init.d/networking/red.down/* 2> /dev/null); do
                        check_script_status
                        OUT=$(echo $(basename ${i}) | awk -F- '{ print $2 }')