From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 15 Feb 2013 08:06:52 +0000 (+0100)
Subject: turning off WriteModprobeConfig, which is (1) broken with recent
X-Git-Tag: bootmanager-5.1-4~4
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=4c7ed26bca69e388d0fb9bf6b84cf03709d922d3

turning off WriteModprobeConfig, which is (1) broken with recent
kernels, and (2) most likely totally useless
---

diff --git a/source/BootManager.py b/source/BootManager.py
index 3c3f1d4..68b05e0 100755
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -229,7 +229,12 @@ class BootManager:
             InstallInit.Run( self.VARS, self.LOG )                    
             ret = ValidateNodeInstall.Run( self.VARS, self.LOG )
             if ret == 1:
-                WriteModprobeConfig.Run( self.VARS, self.LOG )
+# Thierry - feb. 2013 turning off WriteModprobeConfig for now
+# for one thing this won't work at all with f18, as modules.pcimap
+# has disappeared (Daniel suggested modules.aliases could be used instead)
+# and second, in any case it's been years now that modprobe.conf was deprecated
+# so most likely this code has no actual effect
+#                WriteModprobeConfig.Run( self.VARS, self.LOG )
                 WriteNetworkConfig.Run( self.VARS, self.LOG )
                 CheckForNewDisks.Run( self.VARS, self.LOG )
                 SendHardwareConfigToPLC.Run( self.VARS, self.LOG )
diff --git a/source/steps/WriteModprobeConfig.py b/source/steps/WriteModprobeConfig.py
index 378802d..de55b96 100644
--- a/source/steps/WriteModprobeConfig.py
+++ b/source/steps/WriteModprobeConfig.py
@@ -38,6 +38,8 @@ def Run( vars, log, filename = "/etc/modprobe.conf"):
 
     # make sure we have this class loaded
     
+    log.write( "\n\nStep: WriteModProbeConfig.\n" )
+
     try:
         SYSIMG_PATH= vars["SYSIMG_PATH"]
         if SYSIMG_PATH == "":
diff --git a/source/steps/__init__.py b/source/steps/__init__.py
index bfef9bc..37e7ef7 100644
--- a/source/steps/__init__.py
+++ b/source/steps/__init__.py
@@ -35,4 +35,5 @@ __all__ = ["ReadNodeConfiguration",
            "InstallWriteConfig",
            "MakeInitrd",
            "WriteNetworkConfig",
-           "WriteModprobeConfig"]
+#           "WriteModprobeConfig",
+           ]