remove hardcoded file list

[bootmanager.git] / source / steps / WriteModprobeConfig.py

diff --git a/source/steps/WriteModprobeConfig.py b/source/steps/WriteModprobeConfig.py
index 63347ef..b954c64 100644 (file)
--- 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