diff options
| author | Juuso Alasuutari | 2006-12-23 19:05:52 +0200 |
|---|---|---|
| committer | Jaka Kranjc | 2007-01-21 23:11:35 +0100 |
| commit | c9ea3bc9dadda4e61c3ef6f2d3c7d04388b1541a (patch) | |
| tree | 2c987712cae0d7a1b484608431713c3893aa72c5 | |
| parent | 2a3c22f1873039d06e7ae827f2e138af68213826 (diff) | |
wpa_supplicant: Made config file optional
| -rwxr-xr-x | net/wpa_supplicant/CONFIGURE | 10 | ||||
| -rw-r--r-- | net/wpa_supplicant/HISTORY | 5 | ||||
| -rwxr-xr-x | net/wpa_supplicant/INSTALL | 10 |
3 files changed, 21 insertions, 4 deletions
diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE index 1bdec9f39e..069d2b22e1 100755 --- a/net/wpa_supplicant/CONFIGURE +++ b/net/wpa_supplicant/CONFIGURE @@ -91,4 +91,12 @@ then config_query CONFIG_PKCS12 "Enable PKCS#12 certificate support?" y && config_query CONFIG_SMARTCARD "Enable smartcard support?" y -fi +fi && + +message "${MESSAGE_COLOR}An example config file will be installed" \ + "in /etc if you choose to install\nthe init script." \ + "${DEFAULT_COLOR}" && + +config_query WPA_CONFIG_FILE \ + "Install config file even without the init script?" \ + n diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY index 0985abce7c..544e820591 100644 --- a/net/wpa_supplicant/HISTORY +++ b/net/wpa_supplicant/HISTORY @@ -1,3 +1,8 @@ +2006-12-23 Juuso Alasuutari <iuso@sourcemage.org> + * CONFIGURE: Added query for making config file optional. + * INSTALL: Only install config file if selected or if init + script is installed. + 2006-12-17 Juuso Alasuutari <iuso@sourcemage.org> * wpa_supplicant.conf: Added, new name for default config file. Added ap_scan option and comments. diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL index 95514cb28f..188369ce96 100755 --- a/net/wpa_supplicant/INSTALL +++ b/net/wpa_supplicant/INSTALL @@ -1,12 +1,16 @@ make DESTDIR="$INSTALL_ROOT" install && -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 cp wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin/" +fi && + +if [[ $WPA_CONFIG_FILE == y ]] || + list_find "$INIT_INSTALLED" wpa_supplicant +then + install_config_file "$SCRIPT_DIRECTORY/wpa_supplicant.conf" \ + "$INSTALL_ROOT/etc/wpa_supplicant.conf" fi |