From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 5 Dec 2007 20:28:44 +0000 (+0000)
Subject: Handle wireless (by letting ifup do its thang).
X-Git-Tag: bootcd-3.4-2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=99c15df6621d49100b78c4eec9a8680411409bcf;p=bootcd.git

Handle wireless (by letting ifup do its thang).
---

diff --git a/conf_files/pl_netinit b/conf_files/pl_netinit
index 3d5ea77..b23c054 100644
--- a/conf_files/pl_netinit
+++ b/conf_files/pl_netinit
@@ -300,37 +300,27 @@ if [[ $? -ne 0 ]]; then
     net_init_failed
 fi
 
-if [[ "$IP_METHOD" == "dhcp" ]]; then
-    echo "pl_netinit: attempting to bring up device with dhcp"
-
-    # setup a dhclient conf file for this device (used to send
-    # our hostname to the dhcp server)
-    echo "interface \"$ETH_DEVICE\" {" > $DHCLIENT_CONF_FILE
-    echo "send host-name \"$HOST_NAME.$DOMAIN_NAME\";" >> $DHCLIENT_CONF_FILE
-    echo "}" >> $DHCLIENT_CONF_FILE
-
-    # touch the redhat net device configuration file so 
-    # dhclient doesn't complain
-    /bin/touch /etc/sysconfig/network-scripts/ifcfg-$ETH_DEVICE
-
-    configured=0
-    while [[ $configured -eq 0 ]]; do
-	/sbin/dhclient -1 -cf $DHCLIENT_CONF_FILE $ETH_DEVICE 
-	if [[ $? -ne 0 ]]; then
-	    echo "pl_netinit: dhcp failed, retrying in 2 minutes"
-	    /bin/sleep 120
-	else
-	    echo "pl_netinit: dhcp succeeded"
-	    configured=1
-	    break
-	fi
-    done
-else
-    echo "pl_netinit: configuring device statically"
+ifcfg=/etc/sysconfig/network-scripts/ifcfg-$ETH_DEVICE
+echo "DEVICE=$ETH_DEVICE" > $ifcfg
+[ -n "$NET_DEVICE" ] && \
+  echo "HWADDR=$NET_DEVICE" >> $ifcfg
+echo "BOOTPROTO=$IP_METHOD" >> $ifcfg
+echo "DHCP_HOSTNAME=$HOST_NAME.$DOMAIN_NAME" >> $ifcfg
+
+if [ -n "$WLAN_SSID$WLAN_IWCONFIG$WLAN_MODE" ]; then
+    [ -n "$WLAN_SSID" ] && \
+      echo "ESSID=$WLAN_SSID" >> $ifcfg
+    [ -n "$WLAN_IWCONFIG" ] && \
+      echo "IWCONFIG=$WLAN_IWCONFIG" >> $ifcfg
+    [ -n "$WLAN_MODE" ] && \
+      echo "MODE=$WLAN_MODE" >> $ifcfg
+fi
+
+if [ "$IP_METHOD" = "static" ]; then
+    echo "IPADDR=$IP_ADDRESS" >> $ifcfg
+    echo "NETMASK=$IP_NETMASK" >> $ifcfg
+    echo "GATEWAY=$IP_GATEWAY" >> $ifcfg
 
-    /sbin/ifconfig $ETH_DEVICE $IP_ADDRESS broadcast $IP_BROADCASTADDR \
-	netmask $IP_NETMASK
-    /sbin/route add default gw $IP_GATEWAY dev $ETH_DEVICE
     /bin/hostname "$HOST_NAME.$DOMAIN_NAME"
 
     if [[ -z "$IP_DNS1" ]]; then
@@ -344,6 +334,10 @@ else
     fi
 fi
 
+
+echo "pl_netinit: attempting to bring up device $ETH_DEVICE"
+/sbin/ifup $ETH_DEVICE
+
 # for backwards compatibility
 /sbin/ifconfig $ETH_DEVICE > $IFCONFIG_OUTPUT
 
diff --git a/conf_files/pl_validateconf b/conf_files/pl_validateconf
index f0f0370..cd0d694 100644
--- a/conf_files/pl_validateconf
+++ b/conf_files/pl_validateconf
@@ -4,7 +4,8 @@
 TAGS='IP_METHOD HOST_NAME DOMAIN_NAME PROXY_SERVER
       IP_ADDRESS IP_GATEWAY IP_NETMASK IP_NETADDR IP_BROADCASTADDR 
       IP_DNS1 IP_DNS2 NET_DEVICE NODE_KEY NODE_ID
-      IPMI_ADDRESS IPMI_MAC DISCONNECTED_OPERATION'
+      IPMI_ADDRESS IPMI_MAC DISCONNECTED_OPERATION
+      WLAN_SSID WLAN_IWCONFIG WLAN_MODE'
 
 # Valid characters that variable can be set to
 CHARS='[:alnum:]\.: _-'