X-Git-Url: http://git.grml.org/?p=grml-network.git;a=blobdiff_plain;f=sbin%2Fnetcardconfig;h=348978577a4e2014c6ace780172fef19d7c4d7bf;hp=93120525127d7cb2801c53aa2645e7fa54448b80;hb=55ff86e9ac3e403e4d2842ca872b4be3df35013b;hpb=605428c70101ba690a77582522f36c33b0d5ab60 diff --git a/sbin/netcardconfig b/sbin/netcardconfig index 9312052..3489785 100755 --- a/sbin/netcardconfig +++ b/sbin/netcardconfig @@ -15,7 +15,7 @@ LANGUAGE=C LANG=C export PATH LANGUAGE LANG . /etc/grml/script-functions -check4root +check4root || exit 1 TMP=$(mktemp) @@ -151,11 +151,28 @@ remauto(){ fi } +scanwlan(){ + i=0 + ifconfig $DV up + iwlist $DV scanning | grep "ESSID\|Quality" | sed -e "s/^.*ESSID:\"\|\"$//g" | tac > "$TMP" + while read line + do + # don't show up empty and hidden (containing "\x00") ESSIDs + echo $line | grep -q \\x00 && continue + [ -z "$line" ] && continue + WARRAY[i++]=$line + done < "$TMP" + unset i + rm -f "$TMP" +} + configiface() { [ ! -r /etc/network/interfaces ] && touch /etc/network/interfaces DEVICE=${NETDEVICES[$DV]} device2props DV=$DEVICENAME + ifdown $DV + sleep 3 # wireless config WLDEVICE="$(LANG=C LC_MESSAGEWS=C iwconfig $DV 2>/dev/null | awk '/802\.11|READY|ESSID/{print $1}')" WLDEVICECOUNT="$(LANG=C LC_MESSAGEWS=C iwconfig $DV 2>/dev/null | wc -l)" @@ -240,23 +257,50 @@ configiface() { rm -f "$TMP" fi - $DIALOG --inputbox "$MESSAGEW4 $DEVICENAME $MESSAGEW5" 15 50 "$ESSID" 2>"$TMP" || bailout 1 - read ESSID <"$TMP" ; rm -f "$TMP" - [ -z "$ESSID" ] && ESSID="any" + # ask to scan or manually set wireless network + if $DIALOG --yesno "$MESSAGEWSCAN1" 8 45 ; then + RESCAN=1 + + while [ $RESCAN -eq 1 ] + do + scanwlan + $DIALOG --extra-button --extra-label "Rescan" --menu "$MESSAGEWSCAN2" 20 70 15 "${WARRAY[@] }" 2>"$TMP" + case $? in + 0) + RESCAN=0 + ;; + 3) + ;; + *) + bailout 1 + ;; + esac + done + + read ESSID <"$TMP" ; rm -f "$TMP" + [ -z "$MODE" ] && MODE="Managed" + + else + + $DIALOG --inputbox "$MESSAGEW4 $DEVICENAME $MESSAGEW5" 15 50 "$ESSID" 2>"$TMP" || bailout 1 + read ESSID <"$TMP" ; rm -f "$TMP" + [ -z "$ESSID" ] && ESSID="any" + + $DIALOG --inputbox "$MESSAGEW6 $DEVICENAME $MESSAGEW7" 15 50 "$NWID" 2>"$TMP" || bailout 1 + read NWID <"$TMP" ; rm -f "$TMP" - $DIALOG --inputbox "$MESSAGEW6 $DEVICENAME $MESSAGEW7" 15 50 "$NWID" 2>"$TMP" || bailout 1 - read NWID <"$TMP" ; rm -f "$TMP" + $DIALOG --inputbox "$MESSAGEW8 $DEVICENAME $MESSAGEW9" 15 50 "$MODE" 2>"$TMP" || bailout 1 + read MODE <"$TMP" ; rm -f "$TMP" + [ -z "$MODE" ] && MODE="Managed" - $DIALOG --inputbox "$MESSAGEW8 $DEVICENAME $MESSAGEW9" 15 50 "$MODE" 2>"$TMP" || bailout 1 - read MODE <"$TMP" ; rm -f "$TMP" - [ -z "$MODE" ] && MODE="Managed" + $DIALOG --inputbox "$MESSAGEW10 $DEVICENAME $MESSAGEW11" 15 50 "$CHANNEL" 2>"$TMP" || bailout 1 + read CHANNEL <"$TMP" ; rm -f "$TMP" - $DIALOG --inputbox "$MESSAGEW10 $DEVICENAME $MESSAGEW11" 15 50 "$CHANNEL" 2>"$TMP" || bailout 1 - read CHANNEL <"$TMP" ; rm -f "$TMP" + if [ -z "$CHANNEL" ]; then + $DIALOG --inputbox "$MESSAGEW12 $DEVICENAME $MESSAGEW13" 15 50 "$FREQ" 2>"$TMP" || bailout 1 + read FREQ <"$TMP" ; rm -f "$TMP" + fi - if [ -z "$CHANNEL" ]; then - $DIALOG --inputbox "$MESSAGEW12 $DEVICENAME $MESSAGEW13" 15 50 "$FREQ" 2>"$TMP" || bailout 1 - read FREQ <"$TMP" ; rm -f "$TMP" fi WPAON=0 @@ -325,10 +369,17 @@ configiface() { } } ' /etc/network/interfaces) - $DIALOG --inputbox "$MESSAGEW23 $ESSID" 15 50 "$WPASECRET" 2>"$TMP" || bailout 1 - - # make sure backslashes inside passphrase are handled correct - WPASECRET=$(sed -e 's/\\/\\/g' "$TMP") && rm -r "$TMP" + FIRST_RUN=0 # show the wpasecret input box at least once + while ( [ -z "$WPASECRET" ] || [ "$FIRST_RUN" ] ) ; do + $DIALOG --inputbox "$MESSAGEW23 $ESSID" 15 50 "$WPASECRET" 2>"$TMP" || bailout 1 + read WPASECRET <"$TMP" + if [ -z "$WPASECRET" ] ; then + $DIALOG --msgbox "Sorry, empty password not allowed, please retry." 0 0 || bailout 1 + fi + FIRST_RUN="" + done + + rm -f "$TMP" case $WPA_DEV in hostap) @@ -389,8 +440,8 @@ configiface() { /netmask/{if(found){netmask=$NF}} /broadcast/{if(found){broadcast=$NF}} /gateway/{if(found){gateway=$NF}} - /dns-nameservers/{if(found){dns-nameservers=$NF}} - END{print address" "netmask" "broadcast" "gateway" "dns-nameservers}' /etc/network/interfaces >"$TMP" + /dns-nameservers/{if(found){dnsnameservers=$NF}} + END{print address" "netmask" "broadcast" "gateway" "dnsnameservers}' /etc/network/interfaces >"$TMP" read IP NM BC DG <"$TMP" rm -f "$TMP" fi @@ -478,7 +529,8 @@ MESSAGEW22="Enable WPA support?" MESSAGEW23="Enter the WPA passphrase (passphrase must be 8..63 characters) for" MESSAGEW25="Would you like to store your wep key in it's own private file (" MESSAGEW26=")? If you say no, your wep key will be stored in /etc/network/interfaces and will be readable by any account on your system. You may want to 'chmod 600 /etc/network/interfaces' if you answer no to this question" - +MESSAGEWSCAN1="Scan for available wireless networks?" +MESSAGEWSCAN2="Please choose a wireless network from below:" NETDEVICESCOUNT=0 if [ -r /proc/net/dev ] ; then @@ -486,8 +538,19 @@ if [ -r /proc/net/dev ] ; then else LAN="" fi -[ -n "$WLAN" ] || WLAN=$(tail -n +3 /proc/net/wireless 2>/dev/null|awk -F: '{print $1}'|sort) -unset LAN_DEVICES WLAN_DEVICES FIREWIRE_DEVICES NETDEVICES + +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 ] || [ -d $i/phy80211 ] ) && basename $i ; done) + set -a WLAN_IWCONFIG + for DEV in $LAN ; do + iwconfig $DEV 2>/dev/null 1>&2 && WLAN_IWCONFIG+=($DEV) + done + WLAN=$(echo $WLAN_OLD $WLAN_NEW ${WLAN_IWCONFIG[@]} | tr ' ' '\n' | sort -u) +fi + +unset LAN_DEVICES WLAN_DEVICES FIREWIRE_DEVICES NETDEVICES WLAN_IWCONFIG while read dev mac; do #echo "Making NETDEVICES $NETDEVICESCOUNT $dev" @@ -565,8 +628,6 @@ while (true); do IFACEDONE="" while [ -n "$DV" -a -z "$IFACEDONE" ]; do configiface - ifdown $DV - sleep 3 if ! ifup $DV; then $DIALOG --yesno "$MESSAGE14" 15 50 || IFACEDONE="DONE" else