Added whatmask

Netzwerkscripts erweitert.
upnp.cgi gefixt.
Installer schreibt die Spracheinstellungen wieder.


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

src/initscripts/init.d/net/red/dhcpcd

@@ -14,7 +14,9 @@ LEASEINFO="/var/ipfire/dhcpc/dhcpcd-$1.info"
 
 case "$2" in
 	up)
-		boot_mesg -n "Starting dhcpcd on the $1 interface..."
+		boot_mesg -n "Starting dhcpcd on the $1 interface..."		
+		echo -n "${1}" > /var/ipfire/red/iface
+
 		# Test to see if there is a stale pid file
 		if [ -f "$PIDFILE" ]
 		then
@@ -34,12 +36,13 @@ case "$2" in
 		if [ -n "${DHCP_HOSTNAME}" ]; then
 			DHCP_START+="-h ${DHCP_HOSTNAME}"
 	  fi
-		/sbin/dhcpcd $1 $DHCP_START
+		/sbin/dhcpcd $1 $DHCP_START >/dev/null 2>&1
 		# Save the return value
 		RET="$?"
 		# Print the assigned settings if requested
 		if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then
 			. /var/ipfire/dhcpc/dhcpcd-$1.info
+			logger -t ipfire "DHCPCD Success"
 			if [ "$PRINTALL" = "yes" ]; then
 				echo ""
 				echo_ok
@@ -63,6 +66,7 @@ case "$2" in
 			fi
 		else
 			echo ""
+			logger -t ipfire "DHCPCD Fail"
 			$(exit "$RET")
 			evaluate_retval
 		fi

src/initscripts/init.d/network

@@ -77,9 +77,27 @@ case "${1}" in
 		if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
 			name=red /etc/rc.d/init.d/net/ifup
 		fi
+		;;
 
 	stop)
-
+		# Stopping interfaces...
+		# GREEN
+		name=green /etc/rc.d/init.d/net/ifdown
+		
+		# BLUE
+		if [ "$CONFIG_TYPE" = "4" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
+			name=blue /etc/rc.d/init.d/net/ifdown
+		fi
+		
+		# ORANGE
+		if [ "$CONFIG_TYPE" = "1" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "7" ]; then
+			name=orange /etc/rc.d/init.d/net/ifdown
+		fi
+		
+		# RED
+		if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
+			name=red /etc/rc.d/init.d/net/ifdown
+		fi
 		;;
 
 	restart)