summaryrefslogtreecommitdiffstats
path: root/mod-extra-blacklist.sh
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-03-10 05:35:21 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-03-10 05:35:21 +0100
commit35d47fcdcceb19ba381f777734ac8fa06208bbd6 (patch)
tree5d1884b5edabbd4ada038f5ef1b0f5262f125193 /mod-extra-blacklist.sh
parent7b5a8db147ed57d81f4986ce41a9c7ad8e941b51 (diff)
parent33fb0f27577c1cb87828d3aa16de25bb27cfead5 (diff)
downloadkernel-35d47fcdcceb19ba381f777734ac8fa06208bbd6.tar.gz
kernel-35d47fcdcceb19ba381f777734ac8fa06208bbd6.tar.xz
kernel-35d47fcdcceb19ba381f777734ac8fa06208bbd6.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'mod-extra-blacklist.sh')
-rwxr-xr-xmod-extra-blacklist.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/mod-extra-blacklist.sh b/mod-extra-blacklist.sh
index 9569ef6f2..c4c4f8f6d 100755
--- a/mod-extra-blacklist.sh
+++ b/mod-extra-blacklist.sh
@@ -46,3 +46,11 @@ foreachp()
[ -d "$buildroot/etc/modprobe.d/" ] || mkdir -p "$buildroot/etc/modprobe.d/"
find "$buildroot/$kernel_base/extra" -name "*.ko*" | \
foreachp check_blacklist
+
+# Many BIOS-es export a PNP-id which causes the floppy driver to autoload
+# even though most modern systems don't have a 3.5" floppy driver anymore
+# this replaces the old die_floppy_die.patch which removed the PNP-id from
+# the module
+if [ -f $buildroot/$kernel_base/extra/drivers/block/floppy.ko* ]; then
+ blacklist "floppy"
+fi