X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FWriteModprobeConfig.py;h=f43e31a9b5f52cbe76375637ac33fea3b3061945;hb=6dbdbad233ca8770d2f9913c161a3da3f7b8130d;hp=81f01bd9ef123f40d6b0b8c874fd3df85c80af6f;hpb=4eea76a0545774fae808b29d94227be100872bf7;p=bootmanager.git

diff --git a/source/steps/WriteModprobeConfig.py b/source/steps/WriteModprobeConfig.py
index 81f01bd..f43e31a 100644
--- a/source/steps/WriteModprobeConfig.py
+++ b/source/steps/WriteModprobeConfig.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-
+#!/usr/bin/python2
+#
 # 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.
 
+    log.write( "\n\nStep: WriteModProbeConfig.\n" )
+
     # 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()
-    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)