From 3e8627dea8cccd962868cb024d3478dcb82bbd6e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 10 Jun 2021 08:46:24 -0700 Subject: [PATCH] Never include bluetooth module by default This is a temporary workaround for RHBZ #1964879. Once that is fixed properly it can be removed. --- ...the-bluetooth-module-by-default-1521.patch | 33 +++++++++++++++++++ dracut.spec | 10 +++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0001-Never-enable-the-bluetooth-module-by-default-1521.patch diff --git a/0001-Never-enable-the-bluetooth-module-by-default-1521.patch b/0001-Never-enable-the-bluetooth-module-by-default-1521.patch new file mode 100644 index 0000000..f815750 --- /dev/null +++ b/0001-Never-enable-the-bluetooth-module-by-default-1521.patch @@ -0,0 +1,33 @@ +From ea8c9b1c4f39c52fc45788516dea19892cc275f7 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 10 Jun 2021 08:41:30 -0700 +Subject: [PATCH] Never enable the bluetooth module by default (#1521) + +Signed-off-by: Adam Williamson +--- + modules.d/62bluetooth/module-setup.sh | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/modules.d/62bluetooth/module-setup.sh b/modules.d/62bluetooth/module-setup.sh +index b8270dd5..fd22670d 100755 +--- a/modules.d/62bluetooth/module-setup.sh ++++ b/modules.d/62bluetooth/module-setup.sh +@@ -6,14 +6,7 @@ + check() { + # If the binary(s) requirements are not fulfilled the module can't be installed + require_any_binary /usr/lib/bluetooth/bluetoothd /usr/libexec/bluetooth/bluetoothd || return 1 +- +- if [[ $hostonly ]]; then +- # Include by default if a Peripheral (0x500) is found of minor class: +- # * Keyboard (0x40) +- # * Keyboard/pointing (0xC0) +- grep -qiE 'Class=0x[0-9a-f]{3}5[4c]0' /var/lib/bluetooth/*/*/info 2> /dev/null && return 0 +- fi +- ++ # disabled until https://github.com/dracutdevs/dracut/issues/1521 is resolved + return 255 + } + +-- +2.32.0.rc2 + diff --git a/dracut.spec b/dracut.spec index ef9b56d..a104985 100644 --- a/dracut.spec +++ b/dracut.spec @@ -5,7 +5,7 @@ # strip the automatically generated dep here and instead co-own the # directory. %global __requires_exclude pkg-config -%define dist_free_release 1 +%define dist_free_release 2 Name: dracut Version: 055 @@ -32,6 +32,11 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar Source1: https://www.gnu.org/licenses/lgpl-2.1.txt +# Never auto-enable bluetooth module (but it can be manually included +# for debugging) - workaround for RHBZ #1964879 / upstream #1521, to +# be removed when that is properly fixed +Patch0: 0001-Never-enable-the-bluetooth-module-by-default-1521.patch + BuildRequires: bash BuildRequires: git-core BuildRequires: pkgconfig(libkmod) >= 23 @@ -484,6 +489,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Thu Jun 10 2021 Adam Williamson - 055-2 +- Never include bluetooth module by default (rhbz 1964879) (workaround) + * Thu May 27 2021 Harald Hoyer - 055-1 - version 055 - install the missing fsck utils