diff options
author | Juuso Alasuutari | 2006-12-17 14:30:35 +0200 |
---|---|---|
committer | Jaka Kranjc | 2007-01-21 23:11:32 +0100 |
commit | 2a3c22f1873039d06e7ae827f2e138af68213826 (patch) | |
tree | 1092a79f5bdbac9741d3a07cd5075006ccec2b0b | |
parent | bf305e841aa59693f32e7cc133a57219033c1eba (diff) |
wpa_supplicant: install man pages, better default conffile, minor fixes
-rwxr-xr-x | net/wpa_supplicant/FINAL | 7 | ||||
-rw-r--r-- | net/wpa_supplicant/HISTORY | 10 | ||||
-rwxr-xr-x | net/wpa_supplicant/INSTALL | 7 | ||||
-rwxr-xr-x | net/wpa_supplicant/init.d/wpa_supplicant | 4 | ||||
-rw-r--r-- | net/wpa_supplicant/init.d/wpa_supplicant.conf | 4 | ||||
-rw-r--r-- | net/wpa_supplicant/wpa_ctrl.conf | 9 | ||||
-rw-r--r-- | net/wpa_supplicant/wpa_supplicant.conf | 16 |
7 files changed, 39 insertions, 18 deletions
diff --git a/net/wpa_supplicant/FINAL b/net/wpa_supplicant/FINAL index f4b98a6519..d113d4b311 100755 --- a/net/wpa_supplicant/FINAL +++ b/net/wpa_supplicant/FINAL @@ -1,3 +1,4 @@ -message "\n${MESSAGE_COLOR}If you installed the init script you probably" \ - "need to edit\n/etc/sysconfig/wpa_supplicant to suit your system" \ - "configuration.${DEFAULT_COLOR}\n" +message "${MESSAGE_COLOR}If you installed the init script you probably" \ + "need to edit\n/etc/sysconfig/wpa_supplicant and" \ + "/etc/wpa_supplicant.conf\nto configure hardware and network" \ + "settings.${DEFAULT_COLOR}" diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY index ca2bbb4a70..0985abce7c 100644 --- a/net/wpa_supplicant/HISTORY +++ b/net/wpa_supplicant/HISTORY @@ -1,3 +1,13 @@ +2006-12-17 Juuso Alasuutari <iuso@sourcemage.org> + * wpa_supplicant.conf: Added, new name for default config file. + Added ap_scan option and comments. + * wpa_ctrl.conf: Deleted. + * INSTALL: Changed default config file name, install man pages. + * FINAL: Added info about default config file to message. + * init.d/wpa_supplicant: Changed status msg wording. + * init.d/wpa_supplicant.conf: Changed default interface (wlan -> + eth1), changed default config file name. + 2006-11-27 Juuso Alasuutari <iuso@sourcemage.org> * PREPARE: Added, query which release to build (new option is devel). * DETAILS: Added devel release version 0.5.6, modified descriptions. diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL index 96f37359b6..95514cb28f 100755 --- a/net/wpa_supplicant/INSTALL +++ b/net/wpa_supplicant/INSTALL @@ -1,7 +1,10 @@ make DESTDIR="$INSTALL_ROOT" install && -install_config_file "$SCRIPT_DIRECTORY/wpa_ctrl.conf" \ - "$INSTALL_ROOT/etc/wpa_ctrl.conf" && +install_config_file "$SCRIPT_DIRECTORY/wpa_supplicant.conf" \ + "$INSTALL_ROOT/etc/wpa_supplicant.conf" && + +cp doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8/" && +cp doc/docbook/*.5 "$INSTALL_ROOT/usr/share/man/man5/" && if is_depends_enabled $SPELL qt-x11 then diff --git a/net/wpa_supplicant/init.d/wpa_supplicant b/net/wpa_supplicant/init.d/wpa_supplicant index 7214f8916d..90dcd79222 100755 --- a/net/wpa_supplicant/init.d/wpa_supplicant +++ b/net/wpa_supplicant/init.d/wpa_supplicant @@ -18,7 +18,7 @@ start() if /usr/sbin/iwconfig 2>&1 | grep -q "^$INTERFACE "; then if [[ $(/usr/sbin/iwconfig 2>/dev/null | grep "$INTERFACE *unassociated") ]] then - echo Starting control interface... + echo Starting wpa_supplicant... $PROGRAM -B -i $INTERFACE -D $DRIVER -c $CONFIG -g $CONTROL evaluate_retval /bin/echo "INTERFACE=\"$INTERFACE\"" 2>/dev/null > $DROPFILE @@ -44,7 +44,7 @@ stop() required_executable $CLI [[ -f $DROPFILE ]] && . $DROPFILE && rm $DROPFILE - echo Stopping control interface... + echo Stopping wpa_supplicant... $CLI -i $INTERFACE terminate 1>/dev/null evaluate_retval } diff --git a/net/wpa_supplicant/init.d/wpa_supplicant.conf b/net/wpa_supplicant/init.d/wpa_supplicant.conf index 5bca903e96..8ffd3e1e2f 100644 --- a/net/wpa_supplicant/init.d/wpa_supplicant.conf +++ b/net/wpa_supplicant/init.d/wpa_supplicant.conf @@ -3,13 +3,13 @@ # # Network interface name -INTERFACE=wlan +INTERFACE=eth1 # Device driver DRIVER=wext # Config file -CONFIG=/etc/wpa_ctrl.conf +CONFIG=/etc/wpa_supplicant.conf # Global control interface socket CONTROL=/var/run/wpa_supplicant-global diff --git a/net/wpa_supplicant/wpa_ctrl.conf b/net/wpa_supplicant/wpa_ctrl.conf deleted file mode 100644 index d3af0d633b..0000000000 --- a/net/wpa_supplicant/wpa_ctrl.conf +++ /dev/null @@ -1,9 +0,0 @@ -# -# wpa_supplicant control interface config for Source Mage GNU/Linux. -# - -# Control interface -ctrl_interface=/var/run/wpa_supplicant - -# Members of this group can access the control interface -ctrl_interface_group=root diff --git a/net/wpa_supplicant/wpa_supplicant.conf b/net/wpa_supplicant/wpa_supplicant.conf new file mode 100644 index 0000000000..62010044e5 --- /dev/null +++ b/net/wpa_supplicant/wpa_supplicant.conf @@ -0,0 +1,16 @@ +# +# wpa_supplicant default config for Source Mage GNU/Linux. +# +# See 'man wpa_supplicant.conf' for more info. +# + +# Control interface +ctrl_interface=/var/run/wpa_supplicant + +# Members of this group can access the control interface +ctrl_interface_group=root + +# Set this to 2 if you have trouble associating with APs using hidden SSIDs +ap_scan=1 + +### Add network blocks after this line ### |