wok-current diff wpa_supplicant/receipt @ rev 15920
slitaz-base-files: create /var/run
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Feb 18 20:18:29 2014 +0000 (2014-02-18) |
parents | 3196dad7fb36 |
children | e47c0281ba48 |
line diff
1.1 --- a/wpa_supplicant/receipt Tue Dec 10 13:16:06 2013 +0000 1.2 +++ b/wpa_supplicant/receipt Tue Feb 18 20:18:29 2014 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="wpa_supplicant" 1.7 -VERSION="1.1" 1.8 +VERSION="2.1" 1.9 CATEGORY="utilities" 1.10 SHORT_DESC="WPA Supplicant with support for WPA and WPA2" 1.11 MAINTAINER="0dddba11@googlemail.com" 1.12 @@ -57,20 +57,22 @@ 1.13 $src/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \ 1.14 $fs/etc/dbus-1/system.d/wpa_supplicant.conf 1.15 1.16 - # Startup script and cleaned up wpa_supplicant.conf 1.17 - cp -a stuff/etc $fs 1.18 - # dont copy the original 1.19 - # cp -a $src/$PACKAGE/wpa_supplicant.conf $fs/etc 1.20 + # Startup script and cleaned up wpa_empty.conf 1.21 + cp -a $stuff/etc $fs 1.22 + cp -a $src/$PACKAGE/wpa_supplicant.conf $fs/etc/wpa 1.23 } 1.24 1.25 # Pre and post install commands for Tazpkg. 1.26 post_install() 1.27 { 1.28 - grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> $1/etc/daemons.conf <<EOT 1.29 + grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> $1/etc/daemons.conf << EOT 1.30 + 1.31 # wpa_supplicant daemon options 1.32 -WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa_supplicant.conf -i \$(. /etc/network.conf ; echo \$WIFI_INTERFACE)" 1.33 +WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa/wpa.conf -i \$(. /etc/network.conf ; echo \$WIFI_INTERFACE)" 1.34 1.35 EOT 1.36 + # We use /etc/wpa/wpa.conf from SliTaz 5.0 1.37 + sed -i s'#/etc/wpa_supplicant.conf#/etc/wpa/wpa.conf#'/ $1/etc/daemons.conf 2> /dev/null 1.38 # 'w' option dont exist anymore with < 0.6.9 1.39 sed -i s/'-Bw'/'-B'/ $1/etc/daemons.conf 2> /dev/null 1.40 sed -i s/'-B -w'/'-B'/g $1/etc/init.d/network.sh 2> /dev/null