From 3858ff7e44529635bf08027ff39f927188f5b16a Mon Sep 17 00:00:00 2001 From: Tommy Date: Mon, 3 Jun 2024 15:45:18 -0700 Subject: [PATCH] Bluetooth for workstations + regenerate blacklist Signed-off-by: Tommy --- etc/modprobe.d/server-blacklist.conf | 1 - etc/modprobe.d/vps-blacklist.conf | 1 - etc/modprobe.d/workstation-blacklist.conf | 1 - generate-kmod-blacklist-aggregate.sh | 11 +++++++++++ kmod-whitelist-workstation-all | 1 + kmod-whitelist-workstation-start | 1 + 6 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 kmod-whitelist-workstation-all create mode 100644 kmod-whitelist-workstation-start diff --git a/etc/modprobe.d/server-blacklist.conf b/etc/modprobe.d/server-blacklist.conf index c21ac67..8a6341e 100644 --- a/etc/modprobe.d/server-blacklist.conf +++ b/etc/modprobe.d/server-blacklist.conf @@ -2763,7 +2763,6 @@ install nfs_layout_flexfiles /bin/false install nfs_layout_nfsv41_files /bin/false install nfsv2 /bin/false install nfsv3 /bin/false -install nfsv4 /bin/false install ngbe /bin/false install ngene /bin/false install nhc_dest /bin/false diff --git a/etc/modprobe.d/vps-blacklist.conf b/etc/modprobe.d/vps-blacklist.conf index 1529159..19f7884 100644 --- a/etc/modprobe.d/vps-blacklist.conf +++ b/etc/modprobe.d/vps-blacklist.conf @@ -2599,7 +2599,6 @@ install nfsd /bin/false install nfs_layout_flexfiles /bin/false install nfs_layout_nfsv41_files /bin/false install nfsv3 /bin/false -install nfsv4 /bin/false install ngbe /bin/false install ngene /bin/false install n_gsm /bin/false diff --git a/etc/modprobe.d/workstation-blacklist.conf b/etc/modprobe.d/workstation-blacklist.conf index 045a78c..f0d4d11 100644 --- a/etc/modprobe.d/workstation-blacklist.conf +++ b/etc/modprobe.d/workstation-blacklist.conf @@ -4005,7 +4005,6 @@ install nfs_layout_flexfiles /bin/false install nfs_layout_nfsv41_files /bin/false install nfsv2 /bin/false install nfsv3 /bin/false -install nfsv4 /bin/false install nftl /bin/false install ngbe /bin/false install ngene /bin/false diff --git a/generate-kmod-blacklist-aggregate.sh b/generate-kmod-blacklist-aggregate.sh index bfd34c6..a84f2da 100755 --- a/generate-kmod-blacklist-aggregate.sh +++ b/generate-kmod-blacklist-aggregate.sh @@ -81,6 +81,17 @@ if [ "${dataset}" != 'vps' ]; then done < kmod-whitelist-hw-vendors-all fi +# Apply whitelist for workstation +if [ "${dataset}" = 'workstation' ]; then + while read -r KMOD; do + sed -i "s/^${KMOD}.*//gm" blacklist.txt + done < kmod-whitelist-workstation-start + + while read -r KMOD; do + sed -i "s/.*${KMOD}.*//gm" blacklist.txt + done < kmod-whitelist-workstation-all +fi + # Delete empty lines sed -i '/^$/d' blacklist.txt diff --git a/kmod-whitelist-workstation-all b/kmod-whitelist-workstation-all new file mode 100644 index 0000000..4b4e448 --- /dev/null +++ b/kmod-whitelist-workstation-all @@ -0,0 +1 @@ +bluetooth \ No newline at end of file diff --git a/kmod-whitelist-workstation-start b/kmod-whitelist-workstation-start new file mode 100644 index 0000000..334c6e2 --- /dev/null +++ b/kmod-whitelist-workstation-start @@ -0,0 +1 @@ +btusb \ No newline at end of file