[Devil-linux-commit] build/scripts/scripts setup,1.15,1.16

[<bl...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv2550/build/scripts/scripts

Modified Files:
	setup 
Log Message:
fixed setup to configure NIC's with correct BROADCAST address.


Index: setup
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/setup,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- setup	10 Oct 2003 14:28:50 -0000	1.15
+++ setup	31 Oct 2003 15:29:32 -0000	1.16
@@ -351,14 +351,17 @@
 	    echo "DHCP=yes" >> $NIC
 	    echo "IP=" >> $NIC
 	    echo "NETMASK=" >> $NIC
+	    echo "BROADCAST=" >> $NIC
 	elif [ "$1" = "eth1" ]; then
 	    echo "DHCP=no" >> $NIC
 	    echo "IP=192.168.1.254" >> $NIC
 	    echo "NETMASK=255.255.255.0" >> $NIC
+	    echo "BROADCAST=192.168.1.255" >> $NIC
 	elif [ "$1" = "eth2" ]; then
 	    echo "DHCP=no" >> $NIC
 	    echo "IP=192.168.9.254" >> $NIC
 	    echo "NETMASK=255.255.255.0" >> $NIC
+	    echo "BROADCAST=192.168.9.255" >> $NIC
 	fi
     fi
     NICMENU="MODULE"
@@ -439,7 +442,7 @@
 			mod_config $NIC NETMASK "$(cat $RESULT)"
 		    ;;
 		OPTMOD)
-		    inputbox "NETMASK" "Enter the options for the network module" "$OPTMOD"
+		    inputbox "Options" "Enter the options for the network module" "$OPTMOD"
 		    RETURN=$?
 		    MODULE="$(echo "$MOD $(cat $RESULT|sed 's/\"//g')" | sed 's/ *$//')"
 		    [ $RETURN -eq 0 ] && mod_config $NIC MODULE "\"$MODULE\""
@@ -457,6 +460,9 @@
 	    grep Ethernet /proc/pci
 	    pause
 	else
+	    source $NIC
+	    eval $(ipcalc -b $IP $NETMASK 2> /dev/null)
+	    mod_config $NIC BROADCAST \"$BROADCAST\"
 	    return
 	fi
     done
@@ -500,7 +506,7 @@
 subnet $SUBNET netmask $NETMASK {
   option domain-name-servers $DNS;
   option routers $IP;
-  option broadcast-address $BROADCAST;
+  option broadcast-address $DHBROADCAST;
   range $FIRST $LAST;
 }
 EOF
@@ -520,19 +526,19 @@
     case "$NETMASK" in
 	255.255.255.0)
 		SUBNET=${IP%.*}.0
-		BROADCAST=${IP%.*}.255
+		DHBROADCAST=${IP%.*}.255
 		FIRST=${IP%.*}.100
 		LAST=${IP%.*}.199
 		;;
 	255.255.0.0)
 		SUBNET=${IP%.*.*}.0.0
-		BROADCAST=${IP%.*.*}.255.255
+		DHBROADCAST=${IP%.*.*}.255.255
 		FIRST=${IP%.*.*}.0.100
 		LAST=${IP%.*.*}.0.199
 		;;
 	255.0.0.0)
 		SUBNET=${IP%.*.*.*}.0.0.0
-		BROADCAST=${IP%.*.*.*}.255.255.255
+		DHBROADCAST=${IP%.*.*.*}.255.255.255
 		FIRST=${IP%.*.*.*}.0.0.100
 		LAST=${IP%.*.*.*}.0.0.199
 		;;