X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FWriteModprobeConfig.py;h=b954c648b0397c8dd4033a52be2d47868b44eb1e;hb=926feb6af0dcdfd3348a3c8dc0bf27a936798505;hp=63347ef4b9afb33099391ed3cfcc85a128eddc53;hpb=d4ad6286fa4ee86e6f60c18761df8828e15a375e;p=bootmanager.git

diff --git a/source/steps/WriteModprobeConfig.py b/source/steps/WriteModprobeConfig.py
index 63347ef..b954c64 100644
--- a/source/steps/WriteModprobeConfig.py
+++ b/source/steps/WriteModprobeConfig.py
@@ -59,7 +59,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)
@@ -100,7 +100,7 @@ def Run( vars, log, filename = "/etc/modprobe.conf"):
     if eth_count == 0:
         log.write( "\nIt appears we don't have any network drivers. Aborting.\n" )
         
-        vars['BOOT_STATE']= 'failboot'
+        vars['RUN_LEVEL']= 'failboot'
         vars['STATE_CHANGE_NOTIFY']= 1
         vars['STATE_CHANGE_NOTIFY_MESSAGE']= \
              notify_messages.MSG_NO_DETECTED_NETWORK