modules.d: Drop orphaned blacklist statements

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/etc/modprobe.d/cfg80211.conf b/config/etc/modprobe.d/cfg80211.conf
deleted file mode 100644 (file)
index e72bedd..0000000
--- a/config/etc/modprobe.d/cfg80211.conf
+++ /dev/null
@@ -1 +0,0 @@
-blacklist ieee80211

diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 9911bb0d54cde5901d2c14991da66c39ed2ad441..e8cdeab9f073ea23e7efef4f266add3c29f3ca6c 100644 (file)
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@ -21,7 +21,6 @@ etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
 etc/modprobe.d/btmrvl_sdio.conf
-etc/modprobe.d/cfg80211.conf
 etc/modprobe.d/nf_conntrack.conf
 etc/modprobe.d/pcspeaker.conf
 etc/modules.conf

diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2
index 634b843c237beca0af2690ffa3e4958912adf3b4..b239995441bdf8b0af1e64661dc09e257b60be8a 100644 (file)
--- a/config/rootfiles/common/armv6l/stage2
+++ b/config/rootfiles/common/armv6l/stage2
@@ -21,7 +21,6 @@ etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
 etc/modprobe.d/btmrvl_sdio.conf
-etc/modprobe.d/cfg80211.conf
 etc/modprobe.d/nf_conntrack.conf
 etc/modprobe.d/pcspeaker.conf
 etc/modules.conf

diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index c54fccc20078446eeee819f7e81a3d9d2220611d..f6678fc407c5f290ffaf961c828ad8a9b067815e 100644 (file)
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@ -21,7 +21,6 @@ etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
 etc/modprobe.d/btmrvl_sdio.conf
-etc/modprobe.d/cfg80211.conf
 etc/modprobe.d/nf_conntrack.conf
 etc/modprobe.d/pcspeaker.conf
 etc/modules.conf

diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh
index 6c04955bb125418fc80c74c0ec3f148012a50323..3174122bae5dcc1a6a11fb32281cc53527ec5324 100644 (file)
--- a/config/rootfiles/core/171/update.sh
+++ b/config/rootfiles/core/171/update.sh
@@ -93,6 +93,7 @@ rm -rvf \
 
 # Remove files
 rm -rvf \
+       /etc/modprobe.d/cfg80211.conf \
        /lib/firmware/3com/3C359.bin \
        /lib/firmware/TDA7706_OM_v2.5.1_boot.txt \
        /lib/firmware/TDA7706_OM_v3.0.2_boot.txt \

diff --git a/config/udev/blacklist.conf b/config/udev/blacklist.conf
index 6b763666b12a3899cd08984366ffc6e7ea38ced7..5e470a9caedd7a138f4d27b648055f7bca3d18d4 100644 (file)
--- a/config/udev/blacklist.conf
+++ b/config/udev/blacklist.conf
@@ -1,6 +1,2 @@
 blacklist crc_ccitt
 blacklist slhc
-
-# Intel MEI controllers
-# makes some systems hang on reboot
-blacklist mei