git://git.onelab.eu
/
bootmanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
40ae4a7
)
only look at /etc/modprobe.d/{blacklist,blacklist-compat,blacklist-firewire}
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Wed, 15 Apr 2009 18:16:27 +0000
(18:16 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Wed, 15 Apr 2009 18:16:27 +0000
(18:16 +0000)
source/steps/WriteModprobeConfig.py
patch
|
blob
|
history
diff --git
a/source/steps/WriteModprobeConfig.py
b/source/steps/WriteModprobeConfig.py
index
4b2bfe0
..
64a1126
100644
(file)
--- 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")