diff --git a/etc/archboot/allinone-lts.conf b/etc/archboot/allinone-lts.conf index 9f73230d6..77a3ceafd 100644 --- a/etc/archboot/allinone-lts.conf +++ b/etc/archboot/allinone-lts.conf @@ -15,7 +15,7 @@ arch_pcspkr arch_net arch_isdn pcmcia arch_rtc arch_sound usb usbinput arch_fw a arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arch_encrypt btrfs arch_filesystems arch_remote \ arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_grub arch_efibootmgr \ arch_lilo arch_syslinux arch_iptables arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient \ -arch_smartmontools arch_licenses arch_wireless_lts arch_linux_atm arch_netcfg arch_fsarchiver arch_addons \ +arch_smartmontools arch_licenses arch_wireless arch_wireless_staging_lts arch_linux_atm arch_netcfg arch_fsarchiver arch_addons \ arch_vim arch_wipe arch_testdisk arch_ddrescue arch_chntpw arch_weechat arch_nmap arch_tcpdump \ arch_speedtouch arch_openconnect arch_dnsmasq arch_platform arch_mmc arch_hypervisor arch_dmidecode \ arch_wiki_lite arch_intel_ucode arch_amd_ucode net" diff --git a/etc/archboot/allinone.conf b/etc/archboot/allinone.conf index 21d9dfea7..a8382ccfa 100644 --- a/etc/archboot/allinone.conf +++ b/etc/archboot/allinone.conf @@ -14,9 +14,9 @@ arch_hwdetect arch_udevtrigger pata scsi sata arch_cdrom arch_pcspkr arch_net ar arch_sound usb usbinput arch_fw arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 \ arch_encrypt btrfs arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp \ arch_pppoe arch_lilo arch_grub arch_efibootmgr arch_syslinux arch_iptables arch_pciutils arch_usbutils \ -arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools arch_licenses arch_wireless arch_linux_atm \ -arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_chntpw \ -arch_weechat arch_nmap arch_tcpdump arch_speedtouch arch_openconnect arch_dnsmasq arch_platform \ +arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools arch_licenses arch_wireless arch_wireless_staging \ +arch_linux_atm arch_netcfg arch_fsarchiver arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue \ +arch_chntpw arch_weechat arch_nmap arch_tcpdump arch_speedtouch arch_openconnect arch_dnsmasq arch_platform \ arch_mmc arch_hypervisor arch_dmidecode arch_wiki_lite arch_intel_ucode arch_amd_ucode net" ### NETWORK SETUP diff --git a/etc/archboot/default-ftp-pxelinux.conf b/etc/archboot/default-ftp-pxelinux.conf index e7dd12a67..7b1eeee4e 100644 --- a/etc/archboot/default-ftp-pxelinux.conf +++ b/etc/archboot/default-ftp-pxelinux.conf @@ -16,8 +16,8 @@ arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 ar arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe \ arch_lilo arch_grub arch_efibootmgr arch_syslinux arch_iptables arch_pciutils \ arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools arch_licenses \ -arch_wireless arch_linux_atm arch_netcfg arch_fsarchiver arch_addons arch_vim \ -arch_platform arch_chntpw arch_mmc arch_pxelinux arch_dmidecode arch_wiki_lite \ +arch_wireless arch_wireless_staging arch_linux_atm arch_netcfg arch_fsarchiver arch_addons \ +arch_vim arch_platform arch_chntpw arch_mmc arch_pxelinux arch_dmidecode arch_wiki_lite \ arch_intel_ucode arch_amd_ucode net" ### NETWORK SETUP diff --git a/etc/archboot/default-ftp.conf b/etc/archboot/default-ftp.conf index c6b73a275..8e1b358a7 100644 --- a/etc/archboot/default-ftp.conf +++ b/etc/archboot/default-ftp.conf @@ -16,9 +16,9 @@ arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arc btrfs arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp \ arch_pppoe arch_lilo arch_grub arch_efibootmgr arch_syslinux arch_iptables \ arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools \ -arch_licenses arch_wireless arch_linux_atm arch_netcfg arch_fsarchiver arch_addons \ -arch_vim arch_wipe arch_testdisk arch_ddrescue arch_chntpw arch_mmc arch_platform \ -arch_dmidecode arch_wiki_lite arch_intel_ucode arch_amd_ucode net" +arch_licenses arch_wireless arch_wireless_staging arch_linux_atm arch_netcfg arch_fsarchiver \ +arch_addons arch_vim arch_wipe arch_testdisk arch_ddrescue arch_chntpw arch_mmc \ +arch_platform arch_dmidecode arch_wiki_lite arch_intel_ucode arch_amd_ucode net" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-pxelinux.conf b/etc/archboot/default-pxelinux.conf index f4580f1fa..bfb5d0eb3 100644 --- a/etc/archboot/default-pxelinux.conf +++ b/etc/archboot/default-pxelinux.conf @@ -16,9 +16,9 @@ arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arc arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp arch_pppoe \ arch_lilo arch_grub arch_efibootmgr arch_syslinux arch_iptables arch_pciutils \ arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools arch_licenses arch_wireless \ -arch_linux_atm arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux arch_wipe \ -arch_testdisk arch_ddrescue arch_chntpw arch_platform arch_mmc arch_dmidecode arch_wiki_lite \ -arch_intel_ucode arch_amd_ucode net" +arch_wireless_staging arch_linux_atm arch_netcfg arch_fsarchiver arch_addons arch_vim arch_pxelinux \ +arch_wipe arch_testdisk arch_ddrescue arch_chntpw arch_platform arch_mmc arch_dmidecode \ +arch_wiki_lite arch_intel_ucode arch_amd_ucode net" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf index ddca1cd17..32209ec2f 100644 --- a/etc/archboot/default.conf +++ b/etc/archboot/default.conf @@ -16,8 +16,8 @@ arch_virtio dmraid arch_advanced_root arch_devicemapper arch_mdadm arch_lvm2 arc arch_filesystems arch_remote arch_cpufreq arch_links arch_pacman arch_kexec arch_ppp \ arch_pppoe arch_lilo arch_grub arch_efibootmgr arch_syslinux arch_iptables arch_pciutils \ arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_smartmontools arch_licenses arch_wireless \ -arch_linux_atm arch_netcfg arch_fsarchiver arch_vim arch_addons arch_wipe arch_testdisk \ -arch_ddrescue arch_chntpw arch_platform arch_mmc arch_dmidecide arch_wiki_lite \ +arch_wireless_staging arch_linux_atm arch_netcfg arch_fsarchiver arch_vim arch_addons arch_wipe \ +arch_testdisk arch_ddrescue arch_chntpw arch_platform arch_mmc arch_dmidecide arch_wiki_lite \ arch_intel_ucode arch_amd_ucode net" ### NETWORK SETUP diff --git a/usr/lib/initcpio/install/arch_wireless b/usr/lib/initcpio/install/arch_wireless index 9eb747afe..921647ba3 100644 --- a/usr/lib/initcpio/install/arch_wireless +++ b/usr/lib/initcpio/install/arch_wireless @@ -4,11 +4,6 @@ build () { add_checked_modules '/drivers/net/wireless/|/net/wireless/|/net/ieee80211/|/net/mac80211/' - # add staging wireless here - STAGING="rtl8187se rtl8192e rtl8192u rtl8712 vt6655 vt6656 winbond wlan-ng" - for i in $STAGING; do - add_checked_modules "/drivers/staging/$i" - done apps="/usr/sbin/iwconfig /usr/sbin/iwevent /usr/sbin/iwgetid /usr/sbin/iwlist /usr/sbin/iwpriv \ /usr/sbin/iwspy /usr/sbin/ifrename /usr/bin/b43-fwcutter /usr/sbin/wpa_cli /usr/sbin/wpa_passphrase \ /usr/sbin/wpa_supplicant /usr/sbin/iw /sbin/crda /sbin/regdbdump /usr/sbin/wpa_actiond /usr/sbin/rfkill" diff --git a/usr/lib/initcpio/install/arch_wireless_lts b/usr/lib/initcpio/install/arch_wireless_lts deleted file mode 100644 index 226dbcd01..000000000 --- a/usr/lib/initcpio/install/arch_wireless_lts +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# Created by Tobias Powalowski - -build () -{ - add_checked_modules '/drivers/net/wireless/|/net/wireless/|/net/ieee80211/|/net/mac80211/' - # add staging wireless here - STAGING="brcm80211 rtl8192e rtl8187se rtl8192u rtl8712 vt6655 vt6656 winbond wlan-ng" - for i in $STAGING; do - add_checked_modules "/drivers/staging/$i" - done - apps="/usr/sbin/iwconfig /usr/sbin/iwevent /usr/sbin/iwgetid /usr/sbin/iwlist /usr/sbin/iwpriv \ - /usr/sbin/iwspy /usr/sbin/ifrename /usr/bin/b43-fwcutter /usr/sbin/wpa_cli /usr/sbin/wpa_passphrase \ - /usr/sbin/wpa_supplicant /usr/sbin/iw /sbin/crda /sbin/regdbdump /usr/sbin/wpa_actiond /usr/sbin/rfkill" - for i in $apps; do - add_binary "$i" - done - add_file "/etc/conf.d/wireless" - add_file "/etc/wpa_supplicant.conf" - # add rfkill - add_file "/etc/conf.d/rfkill" - add_file "/etc/rc.d/rfkill" - # add zd1211 firmware files - for i in /usr/lib/firmware/zd1211/* ; do - add_file "$i" - done - # crda support - add_file "/etc/rc.d/wireless-regdom" - add_file "/etc/conf.d/wireless-regdom" - add_file "/usr/lib/crda/regulatory.bin" - # fixing licenses - add_file "/usr/share/licenses/expat/COPYING" - add_file "/usr/share/licenses/dbus-core/COPYING" - add_file "/usr/share/licenses/crda/LICENSE" - add_file "/usr/share/licenses/wireless-regdb/LICENSE" - add_file "/usr/share/licenses/rfkill/LICENSE" -} - -help () -{ -cat< + +build () +{ + # add staging wireless here + STAGING="rtl8187se rtl8192e rtl8192u rtl8712 vt6655 vt6656 winbond wlan-ng" + for i in $STAGING; do + add_checked_modules "/drivers/staging/$i" + done +} + +help () +{ +cat< + +build () +{ + # add staging wireless here + STAGING="brcm80211 rtl8192e rtl8187se rtl8192u rtl8712 vt6655 vt6656 winbond wlan-ng" + for i in $STAGING; do + add_checked_modules "/drivers/staging/$i" + done +} + +help () +{ +cat<