From 5f74bfa1ffeb244987e9b4d516d1463f498c428f Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Wed, 15 Apr 2009 18:16:27 +0000 Subject: [PATCH] only look at /etc/modprobe.d/{blacklist,blacklist-compat,blacklist-firewire} --- source/steps/WriteModprobeConfig.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/steps/WriteModprobeConfig.py b/source/steps/WriteModprobeConfig.py index 4b2bfe0..64a1126 100644 --- a/source/steps/WriteModprobeConfig.py +++ b/source/steps/WriteModprobeConfig.py @@ -59,11 +59,10 @@ def Run( vars, log, filename = "/etc/modprobe.conf"): m.input(mfile) blacklist = modprobe.Modprobe() - if os.path.exists("/etc/modprobe.d"): - flist = os.listdir("/etc/modprobe.d") - for f in flist: - if f.find("blacklist") == 0: - blacklist.input("/etc/modprobe.d/%s"%f) + blacklistfiles = ("blacklist","blacklist-compat","blacklist-firewire") + for blf in blacklistfiles: + if os.path.exists("/etc/modprobe.d/%s"%blf): + blacklist.input("/etc/modprobe.d/%s"%blf) # storage devices m.optionsset("ata_generic","all_generic_ide=1") -- 2.47.0