From 9826ac9bc299360a89c7f3f5bf3df0b9dfc05217 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20M=C3=BCller?= Date: Mon, 3 Oct 2022 10:21:24 +0000 Subject: [PATCH] modules.d: Drop orphaned blacklist statements MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Müller --- config/etc/modprobe.d/cfg80211.conf | 1 - config/rootfiles/common/aarch64/stage2 | 1 - config/rootfiles/common/armv6l/stage2 | 1 - config/rootfiles/common/x86_64/stage2 | 1 - config/rootfiles/core/171/update.sh | 1 + config/udev/blacklist.conf | 4 ---- 6 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 config/etc/modprobe.d/cfg80211.conf diff --git a/config/etc/modprobe.d/cfg80211.conf b/config/etc/modprobe.d/cfg80211.conf deleted file mode 100644 index e72bedde80..0000000000 --- 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 9911bb0d54..e8cdeab9f0 100644 --- 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 634b843c23..b239995441 100644 --- 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 c54fccc200..f6678fc407 100644 --- 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 6c04955bb1..3174122bae 100644 --- 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 6b763666b1..5e470a9cae 100644 --- 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 -- 2.39.5