diff --exclude CVS --exclude .git -uNr skell-1.19/etc/rc.d/init.d/network skell-1.19.modified/etc/rc.d/init.d/network --- skell-1.19/etc/rc.d/init.d/network 2012-03-07 00:04:36.747854485 -0800 +++ skell-1.19.modified/etc/rc.d/init.d/network 2012-03-06 08:23:49.413600567 -0800 @@ -41,12 +41,13 @@ DEPLOYMENT_STYLE=NFS; fi - if [ "$SYSCFG_IFACE0" = "y" ] then echo "Setting up networking on $INTERFACE0: " - if [ "$IPADDR0" = "dhcp" ] + IPSTATIC="y" + if [ `expr match "$IPADDR0" ".*dhcp"` -ne 0 ] then + IPSTATIC="n" if [ "$DEPLOYMENT_STYLE" = "NFS" ] then if [ -f /proc/net/pnp ] @@ -58,8 +59,15 @@ else $SYSCFG_DHCPC_CMD $INTERFACE0 fi - else - # non-dhcp network startup + fi + if [ `expr match "$IPADDR0" ".*ipv4ll"` -ne 0 ] + then + IPSTATIC="n" + $SYSCFG_IPV4LL_CMD $INTERFACE0 + fi + if [ "$IPSTATIC" = "y" ] + then + # static network startup ifconfig $INTERFACE0 $IPADDR0 netmask $NETMASK0 sed -e 's,.*hostname,'$IPADDR0' '`hostname`',' /etc/hosts >/tmp/hosts mv /tmp/hosts /etc/hosts @@ -81,11 +89,20 @@ if [ "$SYSCFG_IFACE1" = "y" ] then echo "Setting up networking on $INTERFACE1: " - if [ "$IPADDR1" = "dhcp" ] + IPSTATIC="y" + if [ `expr match "$IPADDR1" ".*dhcp"` -ne 0 ] then + IPSTATIC="n" $SYSCFG_DHCPC_CMD $INTERFACE1 - else - # non-dhcp network startup + fi + if [ `expr match "$IPADDR1" ".*ipv4ll"` -ne 0 ] + then + IPSTATIC="n" + $SYSCFG_IPV4LL_CMD $INTERFACE1 + fi + if [ "$IPSTATIC" = "y" ] + then + # static network startup ifconfig $INTERFACE1 $IPADDR1 netmask $NETMASK1 if [ -n "$GATEWAY1" ] @@ -105,11 +122,20 @@ if [ "$SYSCFG_IFACE2" = "y" ] then echo "Setting up networking on $INTERFACE2: " - if [ "$IPADDR2" = "dhcp" ] + IPSTATIC="y" + if [ `expr match "$IPADDR2" ".*dhcp"` -ne 0 ] then + IPSTATIC="n" $SYSCFG_DHCPC_CMD $INTERFACE2 - else - # non-dhcp network startup + fi + if [ `expr match "$IPADDR2" ".*ipv4ll"` -ne 0 ] + then + IPSTATIC="n" + $SYSCFG_IPV4LL_CMD $INTERFACE2 + fi + if [ "$IPSTATIC" = "y" ] + then + # static network startup ifconfig $INTERFACE2 $IPADDR2 netmask $NETMASK2 if [ -n "$GATEWAY2" ] @@ -124,11 +150,20 @@ if [ "$SYSCFG_IFACE3" = "y" ] then echo "Setting up networking on $INTERFACE3: " - if [ "$IPADDR3" = "dhcp" ] + IPSTATIC="y" + if [ `expr match "$IPADDR3" ".*dhcp"` -ne 0 ] then + IPSTATIC="n" $SYSCFG_DHCPC_CMD $INTERFACE3 - else - # non-dhcp network startup + fi + if [ `expr match "$IPADDR3" ".*ipv4ll"` -ne 0 ] + then + IPSTATIC="n" + $SYSCFG_IPV4LL_CMD $INTERFACE3 + fi + if [ "$IPSTATIC" = "y" ] + then + # static network startup ifconfig $INTERFACE3 $IPADDR3 netmask $NETMASK3 if [ -n "$GATEWAY3" ] @@ -143,11 +178,20 @@ if [ "$SYSCFG_IFACE4" = "y" ] then echo "Setting up networking on $INTERFACE4: " - if [ "$IPADDR4" = "dhcp" ] + IPSTATIC="y" + if [ `expr match "$IPADDR4" ".*dhcp"` -ne 0 ] then + IPSTATIC="n" $SYSCFG_DHCPC_CMD $INTERFACE4 - else - # non-dhcp network startup + fi + if [ `expr match "$IPADDR4" ".*ipv4ll"` -ne 0 ] + then + IPSTATIC="n" + $SYSCFG_IPV4LL_CMD $INTERFACE4 + fi + if [ "$IPSTATIC" = "y" ] + then + # static network startup ifconfig $INTERFACE4 $IPADDR4 netmask $NETMASK4 if [ -n "$GATEWAY4" ]