diff --git a/lib/initcpio/install/arch_pacman b/lib/initcpio/install/arch_pacman index 1e7aec1f6..1eaee3e46 100644 --- a/lib/initcpio/install/arch_pacman +++ b/lib/initcpio/install/arch_pacman @@ -19,7 +19,8 @@ wpa_supplicant gzip rsync libarchive libdownload device-mapper cracklib nfs-util pcre cpio archboot fuse klibc libusb vi lzo2 libsasl libldap libevent gpm sdparm pptpclient licenses \ madwifi madwifi-utils rt2x00-rt61-fw rt2x00-rt71w-fw rt2500 ndiswrapper ndiswrapper-utils \ zd1211-firmware ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode \ -smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware parted tzdata ntp v86d wlan-ng26-utils" +smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware parted tzdata ntp \ +v86d wlan-ng26-utils iw crda>=0.9.5-1 libnl" for i in $DEPENDS; do for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do diff --git a/lib/initcpio/install/arch_wireless b/lib/initcpio/install/arch_wireless index 349a5f298..94765a0da 100644 --- a/lib/initcpio/install/arch_wireless +++ b/lib/initcpio/install/arch_wireless @@ -4,7 +4,7 @@ install () { MODULES="$(checked_modules "/drivers/net/wirless/") $(checked_modules "/net/wirless/") $(checked_modules "/net/ieee80211/") $(checked_modules "/net/mac80211/")" - BINARIES="iwconfig iwevent iwgetid iwlist iwpriv iwspy ifrename b43-fwcutter wpa_cli wpa_passphrase wpa_supplicant 80211debug 80211stats ath_info athchans athctrl athdebug athkey athstats madwifi-unload wlanconfig nwepgen prism2dl wlancfg wlanctl-ng loadndisdriver perl" + BINARIES="iwconfig iwevent iwgetid iwlist iwpriv iwspy ifrename b43-fwcutter wpa_cli wpa_passphrase wpa_supplicant 80211debug 80211stats ath_info athchans athctrl athdebug athkey athstats madwifi-unload wlanconfig nwepgen prism2dl wlancfg wlanctl-ng loadndisdriver perl iw crda regdbdump" FILES="" SCRIPT="" add_file "/usr/share/archboot/wireless/etc/conf.d/wireless" "/etc/conf.d/wireless" @@ -55,6 +55,11 @@ install () add_file "/usr/lib/perl5/core_perl/DynaLoader.pm" add_file "/usr/lib/perl5/core_perl/XSLoader.pm" add_file "/usr/lib/perl5/core_perl/Fcntl.pm" + # crda support + add_file "/usr/share/archboot/wireless/etc/conf.d/wireless-regdom" "/etc/conf.d/wireless-regdom" + add_file "/etc/rc.d/wireless-regdom" + add_file "/etc/udev/rules.d/regulatory.rules" + add_file "/usr/lib/crda/regulatory.bin" } help () diff --git a/usr/share/archboot/wireless/etc/conf.d/wireless-regdom b/usr/share/archboot/wireless/etc/conf.d/wireless-regdom new file mode 100644 index 000000000..01c14184e --- /dev/null +++ b/usr/share/archboot/wireless/etc/conf.d/wireless-regdom @@ -0,0 +1,114 @@ +# +# Wireless regulatory domain configuration +# + +#WIRELESS_REGDOM="00" +#WIRELESS_REGDOM="AE" +#WIRELESS_REGDOM="AL" +#WIRELESS_REGDOM="AM" +#WIRELESS_REGDOM="AN" +#WIRELESS_REGDOM="AR" +#WIRELESS_REGDOM="AT" +#WIRELESS_REGDOM="AU" +#WIRELESS_REGDOM="AZ" +#WIRELESS_REGDOM="BA" +#WIRELESS_REGDOM="BE" +#WIRELESS_REGDOM="BG" +#WIRELESS_REGDOM="BH" +#WIRELESS_REGDOM="BL" +#WIRELESS_REGDOM="BN" +#WIRELESS_REGDOM="BO" +#WIRELESS_REGDOM="BR" +#WIRELESS_REGDOM="BY" +#WIRELESS_REGDOM="BZ" +#WIRELESS_REGDOM="CA" +#WIRELESS_REGDOM="CH" +#WIRELESS_REGDOM="CL" +#WIRELESS_REGDOM="CN" +#WIRELESS_REGDOM="CO" +#WIRELESS_REGDOM="CR" +#WIRELESS_REGDOM="CS" +#WIRELESS_REGDOM="CY" +#WIRELESS_REGDOM="CZ" +#WIRELESS_REGDOM="DE" +#WIRELESS_REGDOM="DK" +#WIRELESS_REGDOM="DO" +#WIRELESS_REGDOM="DZ" +#WIRELESS_REGDOM="EC" +#WIRELESS_REGDOM="EE" +#WIRELESS_REGDOM="EG" +#WIRELESS_REGDOM="ES" +#WIRELESS_REGDOM="FI" +#WIRELESS_REGDOM="FR" +#WIRELESS_REGDOM="GB" +#WIRELESS_REGDOM="GE" +#WIRELESS_REGDOM="GR" +#WIRELESS_REGDOM="GT" +#WIRELESS_REGDOM="HK" +#WIRELESS_REGDOM="HN" +#WIRELESS_REGDOM="HR" +#WIRELESS_REGDOM="HU" +#WIRELESS_REGDOM="ID" +#WIRELESS_REGDOM="IE" +#WIRELESS_REGDOM="IL" +#WIRELESS_REGDOM="IN" +#WIRELESS_REGDOM="IR" +#WIRELESS_REGDOM="IS" +#WIRELESS_REGDOM="IT" +#WIRELESS_REGDOM="JM" +#WIRELESS_REGDOM="JO" +#WIRELESS_REGDOM="JP" +#WIRELESS_REGDOM="KP" +#WIRELESS_REGDOM="KR" +#WIRELESS_REGDOM="KW" +#WIRELESS_REGDOM="KZ" +#WIRELESS_REGDOM="LB" +#WIRELESS_REGDOM="LI" +#WIRELESS_REGDOM="LK" +#WIRELESS_REGDOM="LT" +#WIRELESS_REGDOM="LU" +#WIRELESS_REGDOM="LV" +#WIRELESS_REGDOM="MA" +#WIRELESS_REGDOM="MC" +#WIRELESS_REGDOM="MK" +#WIRELESS_REGDOM="MO" +#WIRELESS_REGDOM="MT" +#WIRELESS_REGDOM="MX" +#WIRELESS_REGDOM="MY" +#WIRELESS_REGDOM="NL" +#WIRELESS_REGDOM="NO" +#WIRELESS_REGDOM="NP" +#WIRELESS_REGDOM="NZ" +#WIRELESS_REGDOM="OM" +#WIRELESS_REGDOM="PA" +#WIRELESS_REGDOM="PE" +#WIRELESS_REGDOM="PG" +#WIRELESS_REGDOM="PH" +#WIRELESS_REGDOM="PK" +#WIRELESS_REGDOM="PL" +#WIRELESS_REGDOM="PR" +#WIRELESS_REGDOM="PT" +#WIRELESS_REGDOM="QA" +#WIRELESS_REGDOM="RO" +#WIRELESS_REGDOM="RU" +#WIRELESS_REGDOM="SA" +#WIRELESS_REGDOM="SE" +#WIRELESS_REGDOM="SG" +#WIRELESS_REGDOM="SI" +#WIRELESS_REGDOM="SK" +#WIRELESS_REGDOM="SV" +#WIRELESS_REGDOM="SY" +#WIRELESS_REGDOM="TH" +#WIRELESS_REGDOM="TN" +#WIRELESS_REGDOM="TR" +#WIRELESS_REGDOM="TT" +#WIRELESS_REGDOM="TW" +#WIRELESS_REGDOM="UA" +#WIRELESS_REGDOM="US" +#WIRELESS_REGDOM="UY" +#WIRELESS_REGDOM="UZ" +#WIRELESS_REGDOM="VE" +#WIRELESS_REGDOM="VN" +#WIRELESS_REGDOM="YE" +#WIRELESS_REGDOM="ZA" +#WIRELESS_REGDOM="ZW"