export PATH LANGUAGE LANG
. /etc/grml/script-functions
-check4root
+check4root || exit 1
TMP=$(mktemp)
}
}
' /etc/network/interfaces)
- $DIALOG --inputbox "$MESSAGEW23 $ESSID" 15 50 "$WPASECRET" 2>"$TMP" || bailout 1
+ while [ -z "$WPASECRET" ] ; do
+ $DIALOG --inputbox "$MESSAGEW23 $ESSID" 15 50 "$WPASECRET" 2>"$TMP" || bailout 1
+ if [ -z "$WPASECRET" ] ; then
+ $DIALOG --msgbox "Sorry, empty password not allowed, please retry." 0 0 || bailout 1
+ fi
+ done
# make sure backslashes inside passphrase are handled correct
WPASECRET=$(sed -e 's/\\/\\/g' "$TMP") && rm -r "$TMP"
else
LAN=""
fi
-[ -n "$WLAN" ] || WLAN=$(tail -n +3 /proc/net/wireless 2>/dev/null|awk -F: '{print $1}'|sort)
+
+if [ -z "$WLAN" ] ; then
+ WLAN_OLD=$(tail -n +3 /proc/net/wireless 2>/dev/null|awk -F: '{print $1}')
+ # /proc/net/wireless does not work e.g. with iwl3945 on kernel 2.6.33 anymore
+ WLAN_NEW=$(for i in /sys/class/net/* ; do [ -d $i/wireless ] && basename $i ; done)
+ WLAN=$(echo $WLAN_OLD $WLAN_NEW | sort -u)
+fi
+
unset LAN_DEVICES WLAN_DEVICES FIREWIRE_DEVICES NETDEVICES
while read dev mac; do