X-Git-Url: http://git.grml.org/?p=grml-network.git;a=blobdiff_plain;f=sbin%2Fnetcardconfig;h=0b2d89eb69a49fc4df78c30b7e1a17395b8173c5;hp=4eb9759677ae8c105aa3d00a9b2df07ecf7ae533;hb=e8a5795d853f468f2f63fc654ea8959aca194e78;hpb=addd6cfe0e422c10075cb67334594c6a4b19b578 diff --git a/sbin/netcardconfig b/sbin/netcardconfig index 4eb9759..0b2d89e 100755 --- a/sbin/netcardconfig +++ b/sbin/netcardconfig @@ -1,30 +1,26 @@ #!/bin/bash # Filename: grml-network # Purpose: configuration script for network -# Authors: Klaus Knopper 2002, Niall Walsh + Stefan Lippers-Hollmann 2005, Michael Prokop , Marcel Wichern +# Authors: Michael Prokop , Marcel Wichern 2006, Klaus Knopper 2002, Niall Walsh + Stefan Lippers-Hollmann 2004-2007 # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Jän 27 18:15:42 CET 2007 [mika] ################################################################################ -# Changes have been merged from Kanotix's netcardconfig taken from +# Changes have been merged from Kanotix's and Sidux's netcardconfig: # http://kanotix.com/files/debian/pool/main/n/netcardconfig-kanotix/ +# http://svn.berlios.de/wsvn/fullstory/configure-networkcard/trunk/ ################################################################################ PATH="/bin:/sbin:/usr/bin:/usr/sbin" -export PATH +LANGUAGE=C LANG=C +export PATH LANGUAGE LANG -# get root -if [ $UID != 0 ]; then - echo Error: become root before starting $0 >&2 - exit 100 -fi +. /etc/grml/script-functions +check4root || exit 1 TMP=$(mktemp) -WPATMP=$(mktemp) bailout() { rm -f "$TMP" - rm -f "$WPATMP" exit $1 } @@ -77,40 +73,40 @@ writeiwline() { IWOURLINE="$IWOURLINE wireless-essid $ESSID\n" fi - if [ $WPAON -gt 0 ]; then - # Using wpa requires a wpa_supplicant entry - IWPREUPLINE="${IWPREUPLINE}pre-up wpa_supplicant -D$WPA_DEV -i$WLDEVICE -c/etc/wpa_supplicant.conf -B\n" - touch /etc/wpa_supplicant.conf - awk '/^network={/{if(found){found=0}else{found=1;hold=$0}}/ssid={/{if(/ssid='"$ESSID"'/){found=1}else{found=0;print hold}}{if(!found){print}}' /etc/wpa_supplicant.conf >> "$TMP" - wpa_passphrase "$ESSID" "$WPASECRET" 2>/dev/null >> "$TMP" - mv -f /etc/wpa_supplicant.conf /etc/wpa_supplicant.conf.$(date +%Y%m%d_%H%M) - if ! grep -q "For more information take a look at" /etc/wpa_supplicant.conf ; then - cat >$WPATMP <> "$WPATMP" - cat "$WPATMP" "$TMP" > /etc/wpa_supplicant.conf - rm -f $WPATMP 2>/dev/null - IWDOWNLINE="${IWDOWNLINE}down killall wpa_supplicant\n" + if [ "$WPAON" -gt 0 ]; then + IWOURLINE="$IWOURLINE wpa-ssid $ESSID\n wpa-psk $WPASECRET\n" fi - IWOURLINE="$IWOURLINE $IWPREUPLINE $IWDOWNLINE" + IWOURLINE="$IWOURLINE $IWPREUPLINE" #echo "DEBUG: for interfaces $IWOURLINE" } +generate_udev_entry() { + interface='' + mkdir -p /etc/udev/scripts + echo "# Auto generated script from netcardconfig on $(date) +# Executing this script generates an entry in /etc/udev/rules.d/z25_persistent-net.rules +# for you, please check z25_persistent-net.rules for existing entries before +# running this script (once more)." > /etc/udev/scripts/netcardconfig + for interface in `ifconfig | awk '/^[a-z]/ &&!/^lo/{ print $1} '` ; do + echo -n "INTERFACE=$interface /lib/udev/write_net_rules " >> /etc/udev/scripts/netcardconfig && \ + if which udevadm >/dev/null 2>&1; then + udevadm info -a -p /sys/class/net/$interface | awk -F'==' '/address/ {print $2}' >> /etc/udev/scripts/netcardconfig + else + udevinfo -a -p /sys/class/net/$interface | awk -F'==' '/address/ {print $2}' >> /etc/udev/scripts/netcardconfig + fi + done + # send errors to /dev/null as well because the sed line inside the /lib/udev/write_net_rules + # script outputs a sed warning which might unsettle users + chmod +x /etc/udev/scripts/netcardconfig && /etc/udev/scripts/netcardconfig 1>/dev/null 2>&1 +} + +disable_config_dhcp() { + if grep -q CONFIG_DHCP /etc/grml/autoconfig ; then + sed -i "s|^CONFIG_DHCP.*|CONFIG_DHCP='no'|" /etc/grml/autoconfig + fi +} + device2props() { PARTCOUNT=0 isauto=0 @@ -212,19 +208,19 @@ configiface() { read ESSID NWID MODE CHANNEL FREQ SENS RATE RTS FRAG IWCONFIG IWSPY IWPRIV KEY<"$TMP" - if [ "$ESSID" = "~~~" ]; then ESSID=""; fi - if [ "$NWID" = "~~~" ]; then NWID=""; fi - if [ "$MODE" = "~~~" ]; then MODE=""; fi - if [ "$CHANNEL" = "~~~" ]; then CHANNEL=""; fi - if [ "$FREQ" = "~~~" ]; then FREQ=""; fi - if [ "$SENS" = "~~~" ]; then SENS=""; fi - if [ "$RATE" = "~~~" ]; then RATE=""; fi - if [ "$RTS" = "~~~" ]; then RTS=""; fi - if [ "$FRAG" = "~~~" ]; then FRAG=""; fi - if [ "$IWCONFIG" = "~~~" ]; then IWCONFIG=""; fi - if [ "$IWSPY" = "~~~" ]; then IWSPY=""; fi - if [ "$IWPRIV" = "~~~" ]; then IWPRIV=""; fi - if [ "$KEY" = "~~~" ]; then KEY=""; fi + [ "$ESSID" = "~~~" ] && ESSID="" + [ "$NWID" = "~~~" ] && NWID="" + [ "$MODE" = "~~~" ] && MODE="" + [ "$CHANNEL" = "~~~" ] && CHANNEL="" + [ "$FREQ" = "~~~" ] && FREQ="" + [ "$SENS" = "~~~" ] && SENS="" + [ "$RATE" = "~~~" ] && RATE="" + [ "$RTS" = "~~~" ] && RTS="" + [ "$FRAG" = "~~~" ] && FRAG="" + [ "$IWCONFIG" = "~~~" ] && IWCONFIG="" + [ "$IWSPY" = "~~~" ] && IWSPY="" + [ "$IWPRIV" = "~~~" ] && IWPRIV="" + [ "$KEY" = "~~~" ] && KEY="" ESSID=$(echo $ESSID | tr "~" " " | sed 's/ *$//') @@ -276,6 +272,9 @@ configiface() { hostap) WPA_DEV="hostap" ;; + *) + WPA_DEV="wext" + ;; esac if [ -z "$WPA_DEV" ]; then @@ -293,49 +292,71 @@ configiface() { WPAON=-1 if [ -n "$WPA_DEV" ]; then - if $DIALOG --yesno "$MESSAGEW22" 15 50; then - # Other wpa options - # scan_ssid [0]|1 - # bssid 00:11:22:33:44:55 - # priority [0]|Integer - # proto [WPA RSN] WPA|RSN - # key_mgmt [WPA-PSK WPA-EAP]|NONE|WPA-PSK|WPA-EAP|IEEE8021X - # pairwise [CCMP TKIP]|CCMP|TKIP|NONE - # group [CCMP TKIP WEP105 WEP40]|CCMP|TKIP|WEP105|WEP40 - # eapol_flags [3]|1|2 - - if ! $DIALOG --yesno "Is SSID broadcast enabled?" 15 50; then - APSCAN="ap_scan=2" - fi - WPAON=1 - KEY="" - WPASECRET=$(awk '/network/{if(found){found=0}else{found=1}}/ssid/{if(/ssid="'"$ESSID"'"/){found=1}else{found=0}}/#scan_ssid=1/#psk=/{if(found){gsub(/^\W*#psk="/,"");gsub(/"\W*$/,"");print}}' /etc/wpa_supplicant.conf) - - $DIALOG --inputbox "$MESSAGEW23 $ESSID" 15 50 "$WPASECRET" 2>"$TMP" || bailout 1 - WPASECRET=$(sed -e 's/\\/\\/g' "$TMP") && rm -r "$TMP" - - case $WPA_DEV in - hostap) - MODE="Managed" - ;; - esac - else - WPASECRET="" - fi + if $DIALOG --yesno "$MESSAGEW22" 15 50; then + # Other wpa options + # scan_ssid [0]|1 + # bssid 00:11:22:33:44:55 + # priority [0]|Integer + # proto [WPA RSN] WPA|RSN + # key_mgmt [WPA-PSK WPA-EAP]|NONE|WPA-PSK|WPA-EAP|IEEE8021X + # pairwise [CCMP TKIP]|CCMP|TKIP|NONE + # group [CCMP TKIP WEP105 WEP40]|CCMP|TKIP|WEP105|WEP40 + # eapol_flags [3]|1|2 + + WPAON=1 + KEY="" + WPASECRET=$(awk ' + /iface/{ + if(found){ + found=0 + } + else if (/'"$DV"'/){ + found=1 + } + } + /wpa-psk/{ + if(found){ + gsub(/\W*#.*$/,""); + if (gsub(/^\W*wpa-psk\W*/,"")){ + gsub(/\W.*$/,""); + print; + exit; + } + } + } + ' /etc/network/interfaces) + 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" + + case $WPA_DEV in + hostap) + MODE="Managed" + ;; + esac + else + WPASECRET="" + fi else - WPASECRET="" + WPASECRET="" fi # No need for a wep key if we are using wpa if [ ! $WPAON -eq 1 ]; then - $DIALOG --inputbox "$MESSAGEW14 $DEVICENAME $MESSAGEW15" 15 50 "$KEY" 2>"$TMP" || bailout 1 - read KEY <"$TMP" ; rm -f "$TMP" - - if [ -n "$KEY" -a "$PUBKEY" -eq 0 ]; then - if ! $DIALOG --yesno "$MESSAGEW25 $DEVICENAME $MESSAGEW26" 15 50; then - PUBKEY=1 - fi - fi + $DIALOG --inputbox "$MESSAGEW14 $DEVICENAME $MESSAGEW15" 15 50 "$KEY" 2>"$TMP" || bailout 1 + read KEY <"$TMP" ; rm -f "$TMP" + + if [ -n "$KEY" -a "$PUBKEY" -eq 0 ]; then + if ! $DIALOG --yesno "$MESSAGEW25 $DEVICENAME $MESSAGEW26" 15 50; then + PUBKEY=1 + fi + fi fi $DIALOG --inputbox "$MESSAGEW16 $DEVICENAME $MESSAGEW17" 15 50 "$IWCONFIG" 2>"$TMP" || bailout 1 @@ -388,14 +409,14 @@ configiface() { $DIALOG --inputbox "$MESSAGE8 $DV" 10 45 "${BC:-${IP%.*}.255}" 2>"$TMP" || bailout 1 read BC <"$TMP" ; rm -f "$TMP" - $DIALOG --inputbox "$MESSAGE9" 10 45 "${DG:-${IP%.*}.254}" 2>"$TMP" + $DIALOG --inputbox "$MESSAGE9" 10 45 "${DG:-${IP%.*}.1}" 2>"$TMP" read DG <"$TMP" ; rm -f "$TMP" if [ -f "/etc/resolv.conf" ]; then NS="$(awk '/^nameserver/{printf "%s ",$2}' /etc/resolv.conf)" fi - $DIALOG --inputbox "$MESSAGE10" 10 45 "${NS:-${IP%.*}.254}" 2>"$TMP" + $DIALOG --inputbox "$MESSAGE10" 10 45 "${NS:-$DG}" 2>"$TMP" read NS <"$TMP" ; rm -f "$TMP" if [ -w /etc/network/interfaces ]; then @@ -411,33 +432,12 @@ configiface() { #addauto fi -# we are using resolvconf, so don't write to /etc/resolv.conf -# if [ -n "$NS" ]; then -# more="" -# -# for i in $NS; do -# if [ -z "$more" ]; then -# more=yes -# echo "$MESSAGE11 $i" -# echo "nameserver $i" >/etc/resolv.conf -# else -# echo "$MESSAGE12 $i" -# echo "nameserver $i" >>/etc/resolv.conf -# fi -# done -# fi fi echo "Done." } DIALOG="dialog" -# export XDIALOG_HIGH_DIALOG_COMPAT=1 -# [ -n "$DISPLAY" ] && [ -x /usr/bin/Xdialog ] && DIALOG="Xdialog" -# LANGUAGE etc. -[ -r /etc/default/locale ] && . /etc/default/locale - -# Default all strings to English NET_DEVICE_NAME="Network_device" NET_DEVICE_NAME_W="Wireless_device" NET_DEVICE_NAME_FW="Firewire_device" @@ -448,9 +448,9 @@ MESSAGE2="Use DHCP broadcast?" MESSAGE3="Sending DHCP broadcast from device" MESSAGE4="Failed." MESSAGE5="Hit return to exit." -MESSAGE6="Please enter IP Address for " -MESSAGE7="Please enter Network Mask for " -MESSAGE8="Please enter Broadcast Address for " +MESSAGE6="Please enter IP Address for" +MESSAGE7="Please enter Network Mask for" +MESSAGE8="Please enter Broadcast Address for" MESSAGE9="Please enter Default Gateway" MESSAGE10="Please enter Nameserver(s)" MESSAGE11="Setting Nameserver in /etc/resolv.conf to" @@ -483,189 +483,24 @@ 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" -MESSAGEW27="Is SSID broadcast enabled?" - -case "$LANGUAGE" in - de|at|ch) - NET_DEVICE_NAME="Netzwerkkarte" - MESSAGE0="Keine unterstützten Netzwerkkarte(n) gefunden." - MESSAGE1="Bitte Netzwerkkarte auswählen" - MESSAGE2="DHCP Broadcast zur Konfiguration benutzen? (Nein=manuell)" - MESSAGE3="Sende DHCP Broadcast von Netzwerkkarte" - MESSAGE4="Fehlgeschlagen." - MESSAGE5="Eingabetaste zum Beenden." - MESSAGE6="Bitte geben Sie die IP-Adresse ein für " - MESSAGE7="Bitte geben Sie die Netzwerk-Maske ein für " - MESSAGE8="Bitte geben Sie die Broadcast-Adresse ein für " - MESSAGE9="Bitte geben Sie das Default-Gateway ein" - MESSAGE10="Bitte geben Sie den/die Nameserver ein" - MESSAGE11="Setze Nameserver in /etc/resolv.conf auf " - MESSAGE12="Füge Nameserver in /etc/resolv.conf hinzu:" - MESSAGE13="WLAN-Einstellungen konfigurieren?" - MESSAGE14="Fehler beim Aktivieren des Interface, wollen Sie es neu konfigurieren?" - MESSAGE15="Interface aktiviert, beim Systemstart automatisch aktivieren?" - MESSAGEW0="Keine Wireless-Netzwerkkarte gefunden." - MESSAGEW1="Konfiguration der Wireless-Parameter von" - MESSAGEW2="Bitte Wireless-Netzwerkkarte auswählen" - MESSAGEW3="Bitte konfigurieren Sie vorher die IP-Parameter der Karte !" - MESSAGEW4="Geben Sie die ESSID für" - MESSAGEW5="ein\n\n\n(leer für 'any', nicht zu empfehlen !!)\n" - MESSAGEW6="Geben Sie ggf. die NWID (Cell Identifier)\nfür" - MESSAGEW7="ein, falls es eine gibt\n\n\n" - MESSAGEW8="Geben Sie den Modus für" - MESSAGEW9="ein\n\n(Managed(=default), Ad-Hoc, Master,\nRepeater, Secondary, auto)\n" - MESSAGEW10="Geben Sie den Kanal für" - MESSAGEW11="ein\n\n(0 bis 16, leer für auto oder Frequenz-\neingabe im nächsten Fenster)\n" - MESSAGEW12="Geben Sie die Frequenz für" - MESSAGEW13="ein\n\n(z.B. 2.412G, leer für auto)" - MESSAGEW14="Geben Sie den Verschlüsselungs-Key\nfür" - MESSAGEW15="ein\n\n(leer für Klartext, nicht zu empfehlen !!)" - MESSAGEW16="Geben Sie ggf. zusätzliche Parameter für\n'iwconfig" - MESSAGEW17="' ein, z.B.\n\n\nsens -80 rts 512 frag 512 rate 5.5M" - MESSAGEW18="Geben Sie ggf. zusätzliche Parameter für\n'iwspy" - MESSAGEW19="' ein\n\n\n" - MESSAGEW20="Geben Sie ggf. zusätzliche Parameter für\n'iwpriv" - MESSAGEW21="' ein\n\n\n" - MESSAGEW22="WPA-Unterstützung aktivieren?" - MESSAGEW23="WPA-Passwort eingeben für" - MESSAGEW25="WEP-Schlüssel in privater Datei abspeichern (" - MESSAGEW26="? Wenn Sie hier Nein sagen, wird der WEP-Schlüssel in /etc/network/interfaces abgespeichert und kann von allen Accounts auf dem System gelesen werden. Wenn Sie mit Nein antworten, sollten Sie vielleicht 'chmod 600 /etc/network/interfaces' ausführen." - MESSAGEW27="Ist SSID Broadcast aktiviert?" - ;; - es) - NET_DEVICE_NAME="Dispositivo_de_la_red" - MESSAGE0="Se han encontrado tarjetas de red no soportadas." - MESSAGE1="Por favor, seleccione el dispositivo fisico de red" - MESSAGE2="¿Utilizar broadcast DHCP?" - MESSAGE3="Enviando broadcast DHCP desde el dispositivo" - MESSAGE4="Fallado." - MESSAGE5="Pulse enter para salir." - MESSAGE6="Por favor, inserte la dirección IP para " - MESSAGE7="Por favor, inserte la máscara de red para " - MESSAGE8="Por favor, inserte la dirección de Broadcast para " - MESSAGE9="Por favor, inserte la puerta de enlace por defecto" - MESSAGE10="Por favor, inserte los servidores DNS" - MESSAGE11="Poniendo los servidores de nombres de /etc/resolv.conf a " - MESSAGE12="Adicionando servidor DNS a /etc/resolv.conf:" - MESSAGEW0="No se ha encontrado una tarjeta inalámbrica." - MESSAGEW1="Configuración de los parámetros inalámbricos para" - MESSAGEW2="Por favor, seleccione un dispositivo de red inalámbrico" - MESSAGEW3="Por favor, configure primero los parámetros de la IP para la interfaz" - MESSAGEW4="Teclee el ESSID para" - MESSAGEW5="\n\n\n(vacío para 'cualquiera', ¡no recomendado!)\n" - MESSAGEW6="Teclee el NWID (identificador de celda)\npara" - MESSAGEW7=", si es necesario\n\n\n" - MESSAGEW8="Teclee el modo para" - MESSAGEW9="\n\n(Managed(=por_defecto), Ad-Hoc, Master,\nRepeater, Secondary, auto)\n" - MESSAGEW10="Teclee el número del canal para" - MESSAGEW11="\n\n(0 bis 16, vacío para auto o si lo prefiere\n teclee la frecuencia seguidamente)\n" - MESSAGEW12="Teclee la frecuencia para" - MESSAGEW13="\n\n(ej. 2.412G, vacío para auto)" - MESSAGEW14="Teclee la clave de encriptación\npara" - MESSAGEW15="\n\n(vacío para texto plano, ¡¡no recomendado!!)" - MESSAGEW16="Teclee los parámetros adicionales para\n'iwconfig" - MESSAGEW17="' Si es necesario, ej.\n\n\nsens -80 rts 512 frag 512 rate 5.5M" - MESSAGEW18="Teclee los parámetros adicionales para\n'iwspy" - MESSAGEW19="' si es necesario\n\n\n" - MESSAGEW20="Teclee los parámetros adicionales para\n'iwpriv" - MESSAGEW21="' si es necesario\n\n\n" - ;; - it) - NET_DEVICE_NAME="Periferica_di_rete" - NET_DEVICE_NAME_W="Periferica_Wireless" - NET_DEVICE_NAME_FW="Periferica_Firewire" - NET_DEVICE_NAME_AUTO="Automatico" - MESSAGE0="Non ho trovato schede di rete supportate." - MESSAGE1="Per favore seleziona la periferica di rete" - MESSAGE2="Devo utilizzare il broadcast DHCP?" - MESSAGE3="Sto inviando il broadcast DHCP dalla periferica" - MESSAGE4="Fallito." - MESSAGE5="Premi invio per uscire." - MESSAGE6="Inserisci l'indirizzo IP per " - MESSAGE7="Inserisci la maschera di rete per " - MESSAGE8="Inserisci l'indirizzo di broadcast per " - MESSAGE9="Inserisci il Gateway di default" - MESSAGE10="Inserisci i Nameserver" - MESSAGE11="Sto settando i Nameserver in /etc/resolv.conf a" - MESSAGE12="Aggiungo i Nameserver in /etc/resolv.conf:" - MESSAGE13="Configuro le opzioni del wireless?" - MESSAGE14="Non riesco ad attivare l'interfaccia, vuoi riconfigurarla?" - MESSAGE15="Interfaccia attiva, vuoi abilitarla automaticamente all'avvio?" - MESSAGEW0="Nessuna scheda di rete wireless trovata." - MESSAGEW1="Configurazione dei parametri wireless per" - MESSAGEW3="Configura i parametri IP dell'interfaccia per prima cosa!" - MESSAGEW4="Inserisci l'ESSID per" - MESSAGEW5="\n\n\n(vuoto per 'tutti', non raccomandato!)\n" - MESSAGEW6="Inserisci il NWID (cell identifier)\nper" - MESSAGEW7=", se necessario\n\n\n" - MESSAGEW8="Inserisci la modalità per" - MESSAGEW9="\n\n(Managed(=default), Ad-Hoc, Master,\nRepeater, Secondary, auto)\n" - MESSAGEW10="Inserisci il numero di canale per" - MESSAGEW11="\n\n(da 0 a 16, vuoto per automatico o se vuoi\n inserire la frequnza dopo)\n" - MESSAGEW12="Inserisci la frequenza per" - MESSAGEW13="\n\n(es. 2.412G, vuoto per automatico)" - MESSAGEW14="Inserisci la chiave crittografica\nper" - MESSAGEW15="\n\n(vuoto per trasmissione in chiaro, non raccomandato!)" - MESSAGEW16="Inserisci i parametri aggiuntivi per\n'iwconfig" - MESSAGEW17="' se necessario, es.\n\n\nsens -80 rts 512 frag 512 rate 5.5M" - MESSAGEW18="Inserisci parametri aggiuntivi per\n'iwspy" - MESSAGEW19="' se necessario\n\n\n" - MESSAGEW20="Inserisci parametri aggiuntivi per\n'iwpriv" - MESSAGEW21="' se necessario\n\n\n" - MESSAGEW22="Abilito il supporto WPA?" - MESSAGEW23="Inserisci la Passphrase di WPA\nper" - MESSAGEW25="Vuoi memorizzare la tua chiave WEP nel suo file riservato (" - MESSAGEW26=")? Se dici no, la tua chiave WEP sarà memorizzata nel file /etc/network/interfaces e sarà leggibile da tutti gli account del tuo sistema. Dovresti fare 'chmod 600 /etc/network/interfaces' se rispondi no a questa domanda" - MESSAGEW27="Is SSID broadcast enabled?" - ;; -fr) - NET_DEVICE_NAME="Carte_réseau" - MESSAGE0="Aucune carte réseau supportée trouvée." - MESSAGE1="Sélectionnez la carte réseau, svp" - MESSAGE2="Voulez-vous utiliser DHCP?" - MESSAGE3="Envoi de broadcast DHCP par la carte" - MESSAGE4="Echec." - MESSAGE5="Appuyez sur Entrée pour quitter." - MESSAGE6="Entrez une adresse IP pour " - MESSAGE7="Entrez le Masque de Sous-réseau pour " - MESSAGE8="Entrez l'adresse Broadcast pour " - MESSAGE9="Entrez l'IP de la Passerelle par Défaut" - MESSAGE10="Entrez Les DNS de votre FAI" - MESSAGE11="Réglage des DNS dans /etc/resolv.conf" - MESSAGE12="Ajoût des DNS dans /etc/resolv.conf:" - MESSAGEW0="Aucune carte Wifi trouvée." - MESSAGEW1="Configuration des paramètres de réseau sans fil pour " - MESSAGEW3="SVP, Commencez par configurer les paramètres d'IP de l'interface!" - MESSAGEW4="Entrez l'ESSID pour" - MESSAGEW5="\n\n\n(ne rien mettre pour 'peu importe' n'est pas recommandé !)\n" - MESSAGEW6="Entrez le NWID (cell identifier)\npour" - MESSAGEW7=", si nécessaire\n\n\n" - MESSAGEW8="Entrez le mode pour " - MESSAGEW9="\n\n(Managed(=default), Ad-Hoc, Master,\nRepeater, Secondary, auto)\n" - MESSAGEW10="Entrez numéro de canal pour" - MESSAGEW11="\n\n(0 à 16, vide pour auto ou si vous voulez\n entrer la fréquence ensuite)\n" - MESSAGEW12="Entrez la fréquence pour" - MESSAGEW13="\n\n(ex: 2.412G, vide pour auto)" - MESSAGEW14="Entrez la clé de cryptage\npour" - MESSAGEW15="\n\n(vide pour texte en clair, non recommandé !!)" - MESSAGEW16="Entrez des paramètres additionnels pour\n'iwconfig" - MESSAGEW17="' si nécessaire, comme \n\n\nsens -80 rts 512 frag 512 rate 5.5M" - MESSAGEW18="Entrer des paramètres additionnels pour\n'iwspy" - MESSAGEW19="' si nécessaire\n\n\n" - MESSAGEW20="Entrer des paramètres additionnels pour\n'iwpriv" - MESSAGEW21="' si nécessaire\n\n\n" - MESSAGEW22="Activer la protection WPA?" - MESSAGEW23="Entrez le mot-de-passe WPA pour" - MESSAGEW25="Clé WEP sauvée dans un fichier privé (" - MESSAGEW26="? Si vous répondez non ici, la clé WEP sera stockée dans /etc/network/interfaces et pourra être accessible à tous les utilisateurs de la machine. Peut-être serait-il alors judicieux de fixer ainsi les droits de 'interfaces': 'chmod 600 /etc/network/interfaces'" - MESSAGEW27="Is SSID broadcast enabled?" - ;; -esac + NETDEVICESCOUNT=0 -LAN=$(tail -n +3 /proc/net/dev|awk -F: '{print $1}'|sed "s/\s*//"|grep -v -e ^lo -e ^vmnet|sort) -[ -n "$WLAN" ] || WLAN=$(tail -n +3 /proc/net/wireless 2>/dev/null|awk -F: '{print $1}'|sort) +if [ -r /proc/net/dev ] ; then + LAN=$(tail -n +3 /proc/net/dev | awk -F: '{print $1}'| sed "s/\s*//" | grep -v -e ^lo -e ^vmnet | sort) +else + LAN="" +fi + +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 #echo "Making NETDEVICES $NETDEVICESCOUNT $dev" iswlan=$(echo $dev $WLAN|tr ' ' '\n'|sort|uniq -d) @@ -747,7 +582,15 @@ while (true); do if ! ifup $DV; then $DIALOG --yesno "$MESSAGE14" 15 50 || IFACEDONE="DONE" else - $DIALOG --yesno "$MESSAGE15" 15 50 && addauto || remauto + if $DIALOG --yesno "$MESSAGE15" 12 50 ; then + addauto + # get persistent interface names across reboots + generate_udev_entry + # make sure we don't run the dhcp stuff when using /etc/network/interfaces + disable_config_dhcp + else + remauto + fi IFACEDONE="DONE" fi done