diff --git a/etc/modprobe.d/server-blacklist.conf b/etc/modprobe.d/server-blacklist.conf index 7bab914..fa82d80 100644 --- a/etc/modprobe.d/server-blacklist.conf +++ b/etc/modprobe.d/server-blacklist.conf @@ -1941,8 +1941,6 @@ install isst_if_common /bin/false install isst_if_mbox_msr /bin/false install isst_if_mbox_pci /bin/false install isst_if_mmio /bin/false -install isst_tpmi /bin/false -install isst_tpmi_core /bin/false install it5205 /bin/false install it87 /bin/false install it8712f_wdt /bin/false @@ -4843,19 +4841,6 @@ install touchright /bin/false install touchwin /bin/false install tpci200 /bin/false install tpl0102 /bin/false -install tpm_atmel /bin/false -install tpm_i2c_atmel /bin/false -install tpm_i2c_infineon /bin/false -install tpm_i2c_nuvoton /bin/false -install tpm_infineon /bin/false -install tpm_nsc /bin/false -install tpm_st33zp24 /bin/false -install tpm_st33zp24_i2c /bin/false -install tpm_st33zp24_spi /bin/false -install tpm_tis_i2c /bin/false -install tpm_tis_i2c_cr50 /bin/false -install tpm_tis_spi /bin/false -install tpm_vtpm_proxy /bin/false install tps23861 /bin/false install tps40422 /bin/false install tps51632-regulator /bin/false @@ -5309,3 +5294,4 @@ install zopt2201 /bin/false install zpa2326 /bin/false install zpa2326_i2c /bin/false install zpa2326_spi /bin/false +install appletalk /bin/false diff --git a/etc/modprobe.d/vps-blacklist.conf b/etc/modprobe.d/vps-blacklist.conf index 19f7884..979b417 100644 --- a/etc/modprobe.d/vps-blacklist.conf +++ b/etc/modprobe.d/vps-blacklist.conf @@ -871,7 +871,6 @@ install dsbr100 /bin/false install dst /bin/false install dst_ca /bin/false install dtl1_cs /bin/false -install dtpm /bin/false install dummy /bin/false install dummy_stm /bin/false install dvb-as102 /bin/false @@ -1806,7 +1805,6 @@ install intel_powerclamp /bin/false install intel_punit_ipc /bin/false install intel_qat /bin/false install intel-qep /bin/false -install intel_rapl_tpmi /bin/false install intel-rng /bin/false install intel-rst /bin/false install intel_sar /bin/false @@ -1833,11 +1831,9 @@ install intel_th_pti /bin/false install intel_th_sth /bin/false install intel-uncore-frequency /bin/false install intel-uncore-frequency-common /bin/false -install intel-uncore-frequency-tpmi /bin/false install intel-vbtn /bin/false install intel_vpu /bin/false install intel_vsec /bin/false -install intel_vsec_tpmi /bin/false install intel-wmi-sbl-fw-update /bin/false install intel-wmi-thunderbolt /bin/false install intel-xhci-usb-role-switch /bin/false @@ -1966,8 +1962,6 @@ install isst_if_common /bin/false install isst_if_mbox_msr /bin/false install isst_if_mbox_pci /bin/false install isst_if_mmio /bin/false -install isst_tpmi /bin/false -install isst_tpmi_core /bin/false install it87 /bin/false install it8712f_wdt /bin/false install it87_wdt /bin/false @@ -3107,7 +3101,6 @@ install pwm-dwc-core /bin/false install pwm-fan /bin/false install pwm-hibvt /bin/false install pwm-imx27 /bin/false -install pwm-imx-tpm /bin/false install pwm-ir-tx /bin/false install pwm-lpss /bin/false install pwm-lpss-pci /bin/false @@ -4900,18 +4893,6 @@ install toshsd /bin/false install touchit213 /bin/false install touchright /bin/false install touchwin /bin/false -install tpm_atmel /bin/false -install tpm_ftpm_tee /bin/false -install tpm_i2c_atmel /bin/false -install tpm_i2c_infineon /bin/false -install tpm_i2c_nuvoton /bin/false -install tpm_infineon /bin/false -install tpm_nsc /bin/false -install tpm_tis_i2c /bin/false -install tpm_tis_i2c_cr50 /bin/false -install tpm_tis_spi /bin/false -install tpm_tis_synquacer /bin/false -install tpm_vtpm_proxy /bin/false install tps40422 /bin/false install tps53679 /bin/false install tps546d24 /bin/false @@ -5304,3 +5285,4 @@ install zynqmp_dma /bin/false install zynqmp-dpsub /bin/false install zynqmp_edac /bin/false install zynqmp-fpga /bin/false +install appletalk /bin/false diff --git a/etc/modprobe.d/workstation-blacklist.conf b/etc/modprobe.d/workstation-blacklist.conf index 6707652..7bddd0c 100644 --- a/etc/modprobe.d/workstation-blacklist.conf +++ b/etc/modprobe.d/workstation-blacklist.conf @@ -1413,7 +1413,6 @@ install dt3000 /bin/false install dt3155 /bin/false install dt9812 /bin/false install dtl1_cs /bin/false -install dtpm /bin/false install dummy /bin/false install dummy-irq /bin/false install dummy_stm /bin/false @@ -2881,8 +2880,6 @@ install isst_if_common /bin/false install isst_if_mbox_msr /bin/false install isst_if_mbox_pci /bin/false install isst_if_mmio /bin/false -install isst_tpmi /bin/false -install isst_tpmi_core /bin/false install it5205 /bin/false install it87 /bin/false install it8712f_wdt /bin/false @@ -4767,7 +4764,6 @@ install pwm-fsl-ftm /bin/false install pwm-hibvt /bin/false install pwm-imx1 /bin/false install pwm-imx27 /bin/false -install pwm-imx-tpm /bin/false install pwm-iqs620a /bin/false install pwm-ir-tx /bin/false install pwm-keembay /bin/false @@ -6804,10 +6800,6 @@ install st-nci_i2c /bin/false install st-nci_spi /bin/false install stowaway /bin/false install stpddc60 /bin/false -install stpmic1 /bin/false -install stpmic1_onkey /bin/false -install stpmic1_regulator /bin/false -install stpmic1_wdt /bin/false install st_pressure /bin/false install st_pressure_i2c /bin/false install st_pressure_spi /bin/false @@ -7151,21 +7143,6 @@ install touchright /bin/false install touchwin /bin/false install tpci200 /bin/false install tpl0102 /bin/false -install tpm_atmel /bin/false -install tpm_ftpm_tee /bin/false -install tpm_i2c_atmel /bin/false -install tpm_i2c_infineon /bin/false -install tpm_i2c_nuvoton /bin/false -install tpm_infineon /bin/false -install tpm_nsc /bin/false -install tpm_st33zp24 /bin/false -install tpm_st33zp24_i2c /bin/false -install tpm_st33zp24_spi /bin/false -install tpm_tis_i2c /bin/false -install tpm_tis_i2c_cr50 /bin/false -install tpm_tis_spi /bin/false -install tpm_tis_synquacer /bin/false -install tpm_vtpm_proxy /bin/false install tps23861 /bin/false install tps40422 /bin/false install tps51632-regulator /bin/false @@ -7770,3 +7747,4 @@ install zynqmp-dpsub /bin/false install zynqmp_edac /bin/false install zynqmp-fpga /bin/false install zynqmp-sha /bin/false +install appletalk /bin/false diff --git a/generate-kmod-blacklist-aggregate.sh b/generate-kmod-blacklist-aggregate.sh index be758dd..16d6695 100755 --- a/generate-kmod-blacklist-aggregate.sh +++ b/generate-kmod-blacklist-aggregate.sh @@ -92,14 +92,14 @@ if [ "${dataset}" = 'workstation' ]; then done < kmod-whitelist-workstation-all fi -# Delete empty lines -sed -i '/^$/d' blacklist.txt - # Reapply blacklists that got removed by the whitelist section while read -r KMOD; do echo "${KMOD}" >> blacklist.txt done < kmod-blacklist-reapply +# Delete empty lines +sed -i '/^$/d' blacklist.txt + # Delete old files rm -f etc/modprobe.d/"${dataset}"-blacklist.conf diff --git a/kmod-blacklist-reapply b/kmod-blacklist-reapply index e69de29..2c07419 100644 --- a/kmod-blacklist-reapply +++ b/kmod-blacklist-reapply @@ -0,0 +1 @@ +appletalk diff --git a/kmod-whitelist-all b/kmod-whitelist-all index 89f5375..4fc352f 100644 --- a/kmod-whitelist-all +++ b/kmod-whitelist-all @@ -1,5 +1,6 @@ hyperv rfkill +tpm vfio virtio vmw \ No newline at end of file