From a9896590eb4b26becbee905c3da304befa8c147b Mon Sep 17 00:00:00 2001 From: Tommy Date: Mon, 3 Jun 2024 12:11:10 -0700 Subject: [PATCH] Whitelist acpi Signed-off-by: Tommy --- etc/modprobe.d/server-blacklist.conf | 28 ----------------------- etc/modprobe.d/workstation-blacklist.conf | 26 --------------------- generate-kmod-blacklist-aggregate.sh | 1 + kmod-whitelist-hw-vendors-all | 1 + 4 files changed, 2 insertions(+), 54 deletions(-) diff --git a/etc/modprobe.d/server-blacklist.conf b/etc/modprobe.d/server-blacklist.conf index 47049aa..16457ee 100644 --- a/etc/modprobe.d/server-blacklist.conf +++ b/etc/modprobe.d/server-blacklist.conf @@ -53,17 +53,6 @@ install acerhdf /bin/false install acer-wireless /bin/false install acer-wmi /bin/false install acp_audio_dma /bin/false -install acpi-als /bin/false -install acpi_configfs /bin/false -install acpi-cpufreq /bin/false -install acpi_extlog /bin/false -install acpi_ipmi /bin/false -install acpi_mdio /bin/false -install acpi_pad /bin/false -install acpiphp_ibm /bin/false -install acpi_power_meter /bin/false -install acpi_tad /bin/false -install acpi_thermal_rel /bin/false install acquirewdt /bin/false install acrn /bin/false install act8865-regulator /bin/false @@ -676,7 +665,6 @@ install chipone_icn8505 /bin/false install chipreg /bin/false install ch_ipsec /bin/false install ch_ktls /bin/false -install chromeos_acpi /bin/false install chromeos_laptop /bin/false install chromeos_privacy_screen /bin/false install chromeos_pstore /bin/false @@ -817,7 +805,6 @@ install cxd2880-spi /bin/false install cxgb /bin/false install cxgb4vf /bin/false install cxgbit /bin/false -install cxl_acpi /bin/false install cxl_core /bin/false install cxl_mem /bin/false install cxl_pci /bin/false @@ -1678,7 +1665,6 @@ install i2c-dln2 /bin/false install i2c-emev2 /bin/false install i2c-gpio /bin/false install i2c-hid /bin/false -install i2c-hid-acpi /bin/false install i2c-hid-of /bin/false install i2c-i801 /bin/false install i2c-isch /bin/false @@ -1864,7 +1850,6 @@ install intel-ishtp /bin/false install intel-ishtp-hid /bin/false install intel-ishtp-loader /bin/false install intel-lpss /bin/false -install intel-lpss-acpi /bin/false install intel-lpss-pci /bin/false install intel-m10-bmc-core /bin/false install intel-m10-bmc-hwmon /bin/false @@ -1903,7 +1888,6 @@ install intel_telemetry_core /bin/false install intel_telemetry_debugfs /bin/false install intel_telemetry_pltdrv /bin/false install intel_th /bin/false -install intel_th_acpi /bin/false install intel_th_gth /bin/false install intel_th_msu /bin/false install intel_th_msu_sink /bin/false @@ -3092,7 +3076,6 @@ install parport /bin/false install parport_cs /bin/false install parport_pc /bin/false install parport_serial /bin/false -install pata_acpi /bin/false install pata_ali /bin/false install pata_amd /bin/false install pata_artop /bin/false @@ -3925,7 +3908,6 @@ install scsi_transport_spi /bin/false install scsi_transport_srp /bin/false install sd_adc_modulator /bin/false install sdhci /bin/false -install sdhci-acpi /bin/false install sdhci_f_sdh30 /bin/false install sdhci-pci /bin/false install sdhci-pltfm /bin/false @@ -4071,7 +4053,6 @@ install snd-ali5451 /bin/false install snd-aloop /bin/false install snd-als300 /bin/false install snd-als4000 /bin/false -install snd-amd-sdw-acpi /bin/false install snd-asihpi /bin/false install snd-atiixp /bin/false install snd-atiixp-modem /bin/false @@ -4157,8 +4138,6 @@ install snd-indigoiox /bin/false install snd-intel8x0 /bin/false install snd-intel8x0m /bin/false install snd-intel-dspcfg /bin/false -install snd-intel-sdw-acpi /bin/false -install snd-intel-sst-acpi /bin/false install snd-intel-sst-core /bin/false install snd-intel-sst-pci /bin/false install snd-isight /bin/false @@ -4220,8 +4199,6 @@ install snd-soc-acp5x-mach /bin/false install snd-soc-acp6x-mach /bin/false install snd-soc-acp-da7219mx98357-mach /bin/false install snd-soc-acp-es8336-mach /bin/false -install snd-soc-acpi /bin/false -install snd-soc-acpi-intel-match /bin/false install snd-soc-acp-rt5645-mach /bin/false install snd-soc-acp-rt5682-mach /bin/false install snd-soc-adau1372 /bin/false @@ -4588,8 +4565,6 @@ install snd-soc-xlnx-spdif /bin/false install snd-soc-xtfpga-i2s /bin/false install snd-soc-zl38060 /bin/false install snd-sof /bin/false -install snd-sof-acpi /bin/false -install snd-sof-acpi-intel-byt /bin/false install snd-sof-amd-acp /bin/false install snd-sof-amd-acp63 /bin/false install snd-sof-amd-rembrandt /bin/false @@ -4815,7 +4790,6 @@ install sur40 /bin/false install surface3_power /bin/false install surface3_spi /bin/false install surface3-wmi /bin/false -install surface_acpi_notify /bin/false install surface_aggregator /bin/false install surface_aggregator_cdev /bin/false install surface_aggregator_hub /bin/false @@ -4846,7 +4820,6 @@ install sym53c8xx /bin/false install symbolserial /bin/false install synaptics_i2c /bin/false install synaptics_usb /bin/false -install system76_acpi /bin/false install t5403 /bin/false install tag_ar9331 /bin/false install tag_brcm /bin/false @@ -5128,7 +5101,6 @@ install ublk_drv /bin/false install ucan /bin/false install ucd9000 /bin/false install ucd9200 /bin/false -install ucsi_acpi /bin/false install ucsi_ccg /bin/false install ucsi_stm32g0 /bin/false install uda1342 /bin/false diff --git a/etc/modprobe.d/workstation-blacklist.conf b/etc/modprobe.d/workstation-blacklist.conf index afa4452..3e9f856 100644 --- a/etc/modprobe.d/workstation-blacklist.conf +++ b/etc/modprobe.d/workstation-blacklist.conf @@ -35,16 +35,6 @@ install acerhdf /bin/false install acer-wireless /bin/false install acer-wmi /bin/false install acp_audio_dma /bin/false -install acpi-als /bin/false -install acpi-cpufreq /bin/false -install acpi_extlog /bin/false -install acpi_ipmi /bin/false -install acpi_pad /bin/false -install acpiphp_ampere_altra /bin/false -install acpiphp_ibm /bin/false -install acpi_power_meter /bin/false -install acpi_tad /bin/false -install acpi_thermal_rel /bin/false install acrn /bin/false install act8865-regulator /bin/false install act_bpf /bin/false @@ -581,7 +571,6 @@ install chipone_icn8505 /bin/false install chipreg /bin/false install ch_ipsec /bin/false install ch_ktls /bin/false -install chromeos_acpi /bin/false install chromeos_laptop /bin/false install chromeos_privacy_screen /bin/false install chromeos_pstore /bin/false @@ -741,7 +730,6 @@ install cxd2880-spi /bin/false install cxgb /bin/false install cxgb4vf /bin/false install cxgbit /bin/false -install cxl_acpi /bin/false install cxl_core /bin/false install cxl_mem /bin/false install cxl_pci /bin/false @@ -1577,7 +1565,6 @@ install i2c-diolan-u2c /bin/false install i2c-dln2 /bin/false install i2c-gpio /bin/false install i2c-hid /bin/false -install i2c-hid-acpi /bin/false install i2c-hid-of /bin/false install i2c-hid-of-elan /bin/false install i2c-hid-of-goodix /bin/false @@ -1847,7 +1834,6 @@ install intel_telemetry_core /bin/false install intel_telemetry_debugfs /bin/false install intel_telemetry_pltdrv /bin/false install intel_th /bin/false -install intel_th_acpi /bin/false install intel_th_gth /bin/false install intel_th_msu /bin/false install intel_th_msu_sink /bin/false @@ -2872,7 +2858,6 @@ install parport /bin/false install parport_cs /bin/false install parport_pc /bin/false install parport_serial /bin/false -install pata_acpi /bin/false install pata_ali /bin/false install pata_amd /bin/false install pata_artop /bin/false @@ -3833,7 +3818,6 @@ install sctp /bin/false install sctp_diag /bin/false install sd_adc_modulator /bin/false install sdhci /bin/false -install sdhci-acpi /bin/false install sdhci_am654 /bin/false install sdhci-cadence /bin/false install sdhci-esdhc-imx /bin/false @@ -4040,8 +4024,6 @@ install snd-indigoiox /bin/false install snd-intel8x0 /bin/false install snd-intel8x0m /bin/false install snd-intel-dspcfg /bin/false -install snd-intel-sdw-acpi /bin/false -install snd-intel-sst-acpi /bin/false install snd-intel-sst-core /bin/false install snd-isight /bin/false install snd-korg1212 /bin/false @@ -4105,8 +4087,6 @@ install snd-soc-acp5x-mach /bin/false install snd-soc-acp6x-mach /bin/false install snd-soc-acp-da7219mx98357-mach /bin/false install snd-soc-acp-es8336-mach /bin/false -install snd-soc-acpi /bin/false -install snd-soc-acpi-intel-match /bin/false install snd-soc-acp-rt5645-mach /bin/false install snd-soc-acp-rt5682-mach /bin/false install snd-soc-adau1372 /bin/false @@ -4497,9 +4477,6 @@ install snd-soc-xlnx-i2s /bin/false install snd-soc-xlnx-spdif /bin/false install snd-soc-zl38060 /bin/false install snd-sof /bin/false -install snd-sof-acpi /bin/false -install snd-sof-acpi-intel-bdw /bin/false -install snd-sof-acpi-intel-byt /bin/false install snd-sof-amd-acp /bin/false install snd-sof-amd-acp63 /bin/false install snd-sof-amd-rembrandt /bin/false @@ -4753,7 +4730,6 @@ install sunxi_wdt /bin/false install surface3_power /bin/false install surface3_spi /bin/false install surface3-wmi /bin/false -install surface_acpi_notify /bin/false install surface_aggregator /bin/false install surface_aggregator_cdev /bin/false install surface_aggregator_hub /bin/false @@ -4785,7 +4761,6 @@ install synaptics_i2c /bin/false install synaptics_usb /bin/false install synopsys_edac /bin/false install syscon-clk /bin/false -install system76_acpi /bin/false install sysv /bin/false install tag_brcm /bin/false install tag_dsa /bin/false @@ -5050,7 +5025,6 @@ install ublk_drv /bin/false install ucd9000 /bin/false install ucd9200 /bin/false install ucs1002_power /bin/false -install ucsi_acpi /bin/false install ucsi_ccg /bin/false install ucsi_glink /bin/false install ucsi_stm32g0 /bin/false diff --git a/generate-kmod-blacklist-aggregate.sh b/generate-kmod-blacklist-aggregate.sh index 8817ad4..bfd34c6 100755 --- a/generate-kmod-blacklist-aggregate.sh +++ b/generate-kmod-blacklist-aggregate.sh @@ -70,6 +70,7 @@ while read -r KMOD; do sed -i "s/.*${KMOD}.*//gm" blacklist.txt done < kmod-whitelist-all +# Only apply vendor whitelist for non VPS installations if [ "${dataset}" != 'vps' ]; then while read -r KMOD; do sed -i "s/^${KMOD}.*//gm" blacklist.txt diff --git a/kmod-whitelist-hw-vendors-all b/kmod-whitelist-hw-vendors-all index 952ee8f..09f101b 100644 --- a/kmod-whitelist-hw-vendors-all +++ b/kmod-whitelist-hw-vendors-all @@ -1,3 +1,4 @@ +acpi samsung sony wmi \ No newline at end of file