git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shebags mention python2 explicitly
[bootmanager.git]
/
source
/
steps
/
WriteModprobeConfig.py
diff --git
a/source/steps/WriteModprobeConfig.py
b/source/steps/WriteModprobeConfig.py
index
81f01bd
..
f43e31a
100644
(file)
--- a/
source/steps/WriteModprobeConfig.py
+++ b/
source/steps/WriteModprobeConfig.py
@@
-1,5
+1,5
@@
-#!/usr/bin/python
-
+#!/usr/bin/python
2
+#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
@@
-36,6
+36,8
@@
def Run( vars, log, filename = "/etc/modprobe.conf"):
# if the network modules are activated in a different order that the
# boot cd.
# if the network modules are activated in a different order that the
# boot cd.
+ log.write( "\n\nStep: WriteModProbeConfig.\n" )
+
# make sure we have this class loaded
try:
# make sure we have this class loaded
try:
@@
-59,7
+61,7
@@
def Run( vars, log, filename = "/etc/modprobe.conf"):
m.input(mfile)
blacklist = modprobe.Modprobe()
m.input(mfile)
blacklist = modprobe.Modprobe()
- blacklistfiles =
("blacklist","blacklist-compat","blacklist-firewire
")
+ blacklistfiles =
os.listdir("/etc/modprobe.d
")
for blf in blacklistfiles:
if os.path.exists("/etc/modprobe.d/%s"%blf):
blacklist.input("/etc/modprobe.d/%s"%blf)
for blf in blacklistfiles:
if os.path.exists("/etc/modprobe.d/%s"%blf):
blacklist.input("/etc/modprobe.d/%s"%blf)