From: Aaron Klingaman Date: Thu, 28 Apr 2005 18:23:11 +0000 (+0000) Subject: a few typos created the nice chain of events: X-Git-Tag: BOOTCD_V_3_0_FINAL~13 X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=b7aaf6109660af4268692b2ceda7cb7f8ef1cd25 a few typos created the nice chain of events: 1. modules.dep was not being read for the list of modules 2. the script merges pcitable (from hwdata) based on the list of modules (which wasn't present) 3. this resulted in a few modules not being loaded by the boot cd when appropriate, including the mptscsih driver for the scsi controllers in dell 1850s the cd worked fine otherwise because it successfully read modules.pcimap which is generated based on the PCI_ENTRY fields in the drivers. For some reason, the mptscsih driver DOESN'T have a PCI_ENTRY in its driver, so it doesn't show up there. fedora's pcitable (from hwdata) has it, which is why the two sources need to be merged. --- diff --git a/scripts/rewrite-pcitable.py b/scripts/rewrite-pcitable.py index 6ebc537..6ecae0d 100755 --- a/scripts/rewrite-pcitable.py +++ b/scripts/rewrite-pcitable.py @@ -105,7 +105,7 @@ all_modules= {} # first step, create an associative array of all the built modules -for line in modulesdep_file_name: +for line in modulesdep_file: parts= string.split(line,":") if len(parts) < 2: continue @@ -115,7 +115,7 @@ for line in modulesdep_file_name: module_name= parts[len(parts)-1] module_name_len= len(module_name) if module_name[module_name_len-3:] == ".ko": - all_modules[module_name[:3]]= [] + all_modules[module_name[:-3]]= [] # now, parse the pcimap and add devices