From: maniacikarus <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 10 Jun 2007 12:17:52 +0000 (+0000)
Subject: CGI fuer DHCP gefixt und if Skripte zurueckgesetzt
X-Git-Tag: v2.3-beta1~637
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=541d93f0ecd8d8c7e3f5cc8b8d2f957c2d4af042;p=ipfire-2.x.git

CGI fuer DHCP gefixt und if Skripte zurueckgesetzt


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

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 1ccaa40031..e24f7336d8 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -49,7 +49,8 @@ my @nosaved=();
 our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of ip-address';
 
 &Header::showhttpheaders();
-our @ITFs=('GREEN','BLUE');
+our @ITFs=('GREEN');
+if (&Header::blue_used()){push(@ITFs,'BLUE');}
 
 #Settings1 for the first screen box
 foreach my $itf (@ITFs) {
diff --git a/src/initscripts/init.d/net/ifdown b/src/initscripts/init.d/net/ifdown
index 4440480e89..039281c6f6 100644
--- a/src/initscripts/init.d/net/ifdown
+++ b/src/initscripts/init.d/net/ifdown
@@ -35,31 +35,16 @@ then
 		NETADDRESS=${GREEN_NETADDRESS} BROADCAST=${GREEN_BROADCAST} \
 		/etc/rc.d/init.d/net/common/ipv4-static ${GREEN_DEV} down
 		
-	 if [ "${ENABLE_GREEN}" == "on" ]; then
-		boot_mesg "Bringing up dhcpd on device ${DEVICE}."
-		/etc/rc.d/init.d/net/common/dhcpd ${GREEN_DEV} down		
-   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} down
 		
-	 if [ "${ENABLE_BLUE}" == "on" ]; then
-		boot_mesg "Bringing up dhcpd on device ${DEVICE}."
-		/etc/rc.d/init.d/net/common/dhcpd ${BLUE_DEV} down		
-   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} down
 		
-	 if [ "${ENABLE_ORANGE}" == "on" ]; then
-		boot_mesg "Bringing up dhcpd on device ${DEVICE}."
-		/etc/rc.d/init.d/net/common/dhcpd ${ORANGE_DEV} down		
-   fi
-
 	elif [ "$name" == "red" ]; then
 		if [ "${RED_TYPE}" == "PPPOE" ]; then
 			NAME=${name} /etc/rc.d/init.d/net/red/pppoe ${RED_DEV} down
diff --git a/src/initscripts/init.d/net/ifup b/src/initscripts/init.d/net/ifup
index 3866a04d79..d565fcf374 100644
--- a/src/initscripts/init.d/net/ifup
+++ b/src/initscripts/init.d/net/ifup
@@ -24,7 +24,6 @@ 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}"
@@ -64,31 +63,16 @@ boot_mesg_flush
 		/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