Added "automatic wireless" support and sort of 'cleaned' up rc.d/net-profiles

3 files changed, 57 insertions, 46 deletions

diff --git a/contrib/netcfg-auto-wireless b/contrib/netcfg-auto-wireless
index 036cd12..11cf05f 100755
--- a/contrib/netcfg-auto-wireless
+++ b/contrib/netcfg-auto-wireless
@@ -19,7 +19,7 @@ wifi_auto()
         if [[ -n "$profile" ]]; then
             break # If we found a profile, use it.
         fi
-    done < "$(list_networks $IFACE)"
+    done < "$(list_networks $INTERFACE)"
     
     # If there's a profile, connect, else fail.
     if [[ -n "$profile" ]]; then
diff --git a/src/net-profiles b/src/net-profiles
index f9c2875..d9cc4da 100755
--- a/src/net-profiles
+++ b/src/net-profiles
@@ -4,52 +4,62 @@
 . /etc/rc.d/functions
 
 case "$1" in
-	start)
-		if ! ck_daemon net-profiles; then
-			echo "Network Profiles are already running.  Try '/etc/rc.d/net-profiles restart'"
-			exit
-		fi
+    start)
+        if ! ck_daemon net-profiles; then
+            echo "net-profiles has already been started.  Try '/etc/rc.d/net-profiles restart'"
+            exit
+        fi
 
-		# Ensure any device renaming has occurred as intended
-		for daemon in "${DAEMONS[@]}"; do
-			if [ "$daemon" = "${daemon#!}" -a "$daemon" = "net-rename" ]; then
-				if ck_daemon net-rename; then
-					/etc/rc.d/net-rename start
-				fi
-		  fi
-		done
+        # Ensure any device renaming has occurred as intended
+        for daemon in "${DAEMONS[@]}"; do
+            if [ "$daemon" = "${daemon#!}" -a "$daemon" = "net-rename" ]; then
+                if ck_daemon net-rename; then
+                    /etc/rc.d/net-rename start
+                fi
+          fi
+        done
 
-		# $NET env var is passed from the kernel boot line
-		[ ! "$NETWORKS_MENU_TIMEOUT" ] && NETWORKS_MENU_TIMEOUT=5 
+        # $NET env var is passed from the kernel boot line
+        [ ! "$NETWORKS_MENU_TIMEOUT" ] && NETWORKS_MENU_TIMEOUT=5 
+        
+        if [[ "$NET" = "menu" ]]; then
+                /usr/bin/netcfg-menu $NETWORKS_MENU_TIMEOUT
+        elif [[ "$NET" ]]; then
+                /usr/bin/netcfg2 -c $NET
+        else 
+            # No NET= passed at boot, go to NETWORKS=()
+            for network in ${NETWORKS[@]}; do
+                case $network in
+                    menu) # Pull up menu of networks
+                        /usr/bin/netcfg-menu $NETWORKS_MENU_TIMEOUT
+                        ;;
+                    auto-*) # Automatic configuration, store type and get interface next
+                        auto=$network
+                        ;;
+                    *) # Either interface or profile
+                        if [[ "$auto" ]]; then # Auto set, so interface
+                            /usr/bin/netcfg-$auto $network
+                            unset auto 
+                        elif [ "$network" = "${network#!}" ]; then # otherwise profile
+                            /usr/bin/netcfg2 -c $network
+                        fi
+                        ;;
+                esac
+            done
+        fi            
 
-		if [ "$NET" = "menu" -o "$NETWORKS" = "menu" ]; then	
-			/usr/bin/netcfg-menu $NETWORKS_MENU_TIMEOUT
-		elif [ "$NET" ]; then
-			/usr/bin/netcfg2 $NET
-	  elif [ "${NETWORKS[0]}" = "auto-wireless" ]; then
-			if [ "${NETWORKS[1]}" ]; then
-				/usr/bin/netcfg-auto-wireless ${NETWORKS[1]}
-			fi
-		elif [ "$NETWORKS" ]; then 
-			for prof in ${NETWORKS[@]}; do
-				if [ "$prof" = "${prof#!}" ]; then
-					/usr/bin/netcfg2 -c $prof
-				fi
-			done
-		fi
-		
-		add_daemon net-profiles
-		;;
-	stop)
-		# shutdown any profiles started by netcfg (or from NET_PROFILES in rc.conf)
-		/usr/bin/netcfg2 -a
-		rm_daemon net-profiles
-		;;
-	restart)
-		$0 stop; sleep 1; $0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"  
+        add_daemon net-profiles
+        ;;
+    stop)
+        # shutdown any profiles started by netcfg (or from NET_PROFILES in rc.conf)
+        /usr/bin/netcfg2 -a
+        rm_daemon net-profiles
+        ;;
+    restart)
+        $0 stop; sleep 1; $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"  
 esac
 
-# vim: set ts=2 noet:
+# vim: set ts=4 et sw=4:
diff --git a/src/wireless.subr b/src/wireless.subr
index fb81ff5..3e7f6fd 100644
--- a/src/wireless.subr
+++ b/src/wireless.subr
@@ -65,7 +65,8 @@ list_networks()
     [[ -z "$1" ]] && return 1
     essids=$(mktemp /tmp/essid.XXXXX)
 
-    let try 0;
+    let try=0;
+    RETRIES=6;
     while [[ $try -ne $RETRIES ]]; do        
         iwlist $1 scan 2> /dev/null|grep ESSID|sed 's/.*ESSID:"\([^"]\+\)".*/\1/' > $essids
         sleep 0.5; let try++