From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Mon, 26 Nov 2007 22:57:27 +0000 (+0000)
Subject: Use scsi_hostadapterX for the first one too.
X-Git-Tag: bootmanager-3.2-2~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1ab3205673c78debc38214ab1bcb8a541b36f737;p=bootmanager.git

Use scsi_hostadapterX for the first one too.
If ata_generic is going to be loaded, make sure it claims the devices.
---

diff --git a/source/steps/WriteModprobeConfig.py b/source/steps/WriteModprobeConfig.py
index d50ef4d..a9b0d2a 100644
--- a/source/steps/WriteModprobeConfig.py
+++ b/source/steps/WriteModprobeConfig.py
@@ -55,16 +55,13 @@ def Run( vars, log, filename = "/etc/modprobe.conf"):
     scsi_count= 0
 
     modulesconf_file= file("%s/%s" % (SYSIMG_PATH,filename), "w" )
+    modulesconf_file.write("options ata_generic all_generic_ide=1\n")
 
     for type in sysmods:
         if type == systeminfo.MODULE_CLASS_SCSI:
             for a_mod in sysmods[type]:
-                if scsi_count == 0:
-                    modulesconf_file.write( "alias scsi_hostadapter %s\n" %
-                                            a_mod )
-                else:
-                    modulesconf_file.write( "alias scsi_hostadapter%d %s\n" %
-                                            (scsi_count,a_mod) )
+                modulesconf_file.write( "alias scsi_hostadapter%d %s\n" %
+                                        (scsi_count,a_mod) )
                 scsi_count= scsi_count + 1
 
         elif type == systeminfo.MODULE_CLASS_NETWORK: