Red active wurde nur bei pptp erstellt -> gefixt

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

diff --git a/src/initscripts/init.d/net/ifup b/src/initscripts/init.d/net/ifup
index eca4360a6834212d05f3795c4d95411d6c4e7678..3866a04d79bc16d220d49107d052e715f8dab181 100644 (file)
--- a/src/initscripts/init.d/net/ifup
+++ b/src/initscripts/init.d/net/ifup
@@ -24,6 +24,7 @@ boot_mesg_flush
 
 (
        eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+       eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
        if [ "$name" == "green" ]; then
                DEVICE="${GREEN_DEV}"
@@ -62,17 +63,32 @@ boot_mesg_flush
                NETADDRESS=${GREEN_NETADDRESS} BROADCAST=${GREEN_BROADCAST} \
                /etc/rc.d/init.d/net/common/ipv4-static ${GREEN_DEV} up
         fi
+        
+        if [ "${ENABLE_GREEN}" == "on" ]; then
+               boot_mesg "Bringing up dhcpd on device ${DEVICE}."
+               /etc/rc.d/init.d/net/common/dhcpd ${GREEN_DEV} up               
+   fi 
                
        elif [ "$name" == "blue" ]; then
                NAME=${name} ADDRESS=${BLUE_ADDRESS} NETMASK=${BLUE_NETMASK} \
                NETADDRESS=${BLUE_NETADDRESS} BROADCAST=${BLUE_BROADCAST} \
                /etc/rc.d/init.d/net/common/ipv4-static ${BLUE_DEV} up
                
+        if [ "${ENABLE_BLUE}" == "on" ]; then
+               boot_mesg "Bringing up dhcpd on device ${DEVICE}."
+               /etc/rc.d/init.d/net/common/dhcpd ${BLUE_DEV} up                
+   fi 
+               
        elif [ "$name" == "orange" ]; then
                NAME=${name} ADDRESS=${ORANGE_ADDRESS} NETMASK=${ORANGE_NETMASK} \
                NETADDRESS=${ORANGE_NETADDRESS} BROADCAST=${ORANGE_BROADCAST} \
                /etc/rc.d/init.d/net/common/ipv4-static ${ORANGE_DEV} up
                
+        if [ "${ENABLE_ORANGE}" == "on" ]; then
+               boot_mesg "Bringing up dhcpd on device ${DEVICE}."
+               /etc/rc.d/init.d/net/common/dhcpd ${ORANGE_DEV} up              
+   fi 
+               
        elif [ "$name" == "red" ]; then
                if [ "${RED_TYPE}" == "PPPOE" ]; then
                        NAME=${name} /etc/rc.d/init.d/net/red/pppoe ${RED_DEV} up