import string
import os
import popen2
-from merge_hw_tables import merge_hw_tables
+import merge_hw_tables
class systeminfo:
PCI_CLASS_NETWORK= "0200"
PCI_CLASS_RAID= "0104"
PCI_CLASS_RAID2= "0100"
-
+ PCI_CLASS_IDE= "0101"
def get_total_phsyical_mem(self):
"""
device= parts[3]
- # if the last char in device is a number, its
- # a partition, and we ignore it
-
- if device[len(device)-1].isdigit():
- continue
-
dev_name= "/dev/%s" % device
try:
except ValueError, err:
continue
+ # skip and ignore any partitions
+ if minor != 0:
+ continue
+
gb_size= blocks/self.BLOCKS_PER_GB
# parse the output of hdparm <disk> to get the readonly flag;
- def get_system_modules( self, install_root ):
+ def get_system_modules( self, install_root, kernel_version= None ):
"""
Return a list of kernel modules that this system requires.
This requires access to the installed system's root
directory, as the following files must exist and are used:
<install_root>/usr/share/hwdata/pcitable
- <install_root>/lib/modules/(first entry)/modules.pcimap
- <install_root>/lib/modules/(first entry)/modules.dep
+ <install_root>/lib/modules/(first entry if kernel_version unspecified)/modules.pcimap
+ <install_root>/lib/modules/(first entry if kernel version unspecified)/modules.dep
- Note, that this assumes there is only one kernel
- that is installed. If there are more than one, then
- only the first one in a directory listing is used.
+ If there are more than one kernels installed, and the kernel
+ version is not specified, then only the first one in
+ /lib/modules is used.
Returns a dictionary, keys being the type of module:
- scsi MODULE_CLASS_SCSI
- network MODULE_CLASS_NETWORK
The value being the kernel module name to load.
+
+ Some sata devices show up under an IDE device class,
+ hence the reason for checking for ide devices as well.
+ If there actually is a match in the pci -> module lookup
+ table, and its an ide device, its most likely sata,
+ as ide modules are built in to the kernel.
"""
# get the kernel version we are assuming
- try:
- kernel_version= os.listdir( "%s/lib/modules/" % install_root )
- except OSError, e:
- return
+ if kernel_version is None:
+ try:
+ kernel_version= os.listdir( "%s/lib/modules/" % install_root )
+ except OSError, e:
+ return
- if len(kernel_version) == 0:
- return
+ if len(kernel_version) == 0:
+ return
- if len(kernel_version) > 1:
- print( "WARNING: We may be returning modules for the wrong kernel." )
+ if len(kernel_version) > 1:
+ print( "WARNING: We may be returning modules for the wrong kernel." )
+
+ kernel_version= kernel_version[0]
- kernel_version= kernel_version[0]
print( "Using kernel version %s" % kernel_version )
# test to make sure the three files we need are present
# now, with those three files, merge them all into one easy to
# use lookup table
- all_modules= merge_hw_tables().merge_files( modules_dep_path,
- modules_pcimap_path,
- pcitable_path )
-
+ (all_pci_ids, all_modules) = merge_hw_tables.merge_files( modules_dep_path,
+ modules_pcimap_path,
+ pcitable_path )
if all_modules is None:
print( "Unable to merge pci id tables." )
return
-
# this is the actual data structure we return
system_mods= {}
try:
classid= self.remove_quotes(parts[2])
- vendorid= self.remove_quotes(parts[3])
- deviceid= self.remove_quotes(parts[4])
except IndexError:
print( "Skipping invalid line:", string.strip(line) )
continue
if classid not in (self.PCI_CLASS_NETWORK,
self.PCI_CLASS_RAID,
- self.PCI_CLASS_RAID2):
+ self.PCI_CLASS_RAID2,
+ self.PCI_CLASS_IDE):
continue
-
- full_deviceid= "%s:%s" % (vendorid,deviceid)
-
- for module in all_modules.keys():
- if full_deviceid in all_modules[module]:
- if classid == self.PCI_CLASS_NETWORK:
- network_mods.append(module)
- elif classid in (self.PCI_CLASS_RAID,
- self.PCI_CLASS_RAID2):
- scsi_mods.append(module)
-
+
+ try:
+ vendorid= self.remove_quotes(parts[3])
+ vendorid= long(vendorid,16)
+ deviceid= self.remove_quotes(parts[4])
+ deviceid= long(deviceid,16)
+ except IndexError:
+ print( "Skipping invalid line:", string.strip(line) )
+ continue
+ except ValueError, e:
+ print( "Skipping invalid line:", string.strip(line) )
+ continue
+
+
+ # full device id with subvednor & subdevice set to ANY
+ PCI_ANY = 0xffffffffL
+ full_id= (vendorid,deviceid,PCI_ANY,PCI_ANY)
+ module = all_pci_ids.get(full_id, None)
+ if module is None:
+ # continue searching parts[5:] for module with
+ # subvendor first and then subdevice
+ subvendorindex = -1
+ subdeviceindex = -1
+ for i in range(5,len(parts)):
+ p = self.remove_quotes(parts[i])
+ if p[0] != '-':
+ subvendorindex = i
+ break
+
+ if subvendorindex != -1:
+ try:
+ subvendorid= self.remove_quotes(parts[subvendorindex])
+ subvendorid= long(subvendorid,16)
+ except IndexError:
+ print( "Skipping invalid line:", string.strip(line) )
+ continue
+ except ValueError, e:
+ print( "Skipping invalid line:", string.strip(line) )
+ continue
+
+ full_id=(vendorid,deviceid,subvendorid,PCI_ANY)
+ module = all_pci_ids.get(full_id, None)
+ if module is None:
+ for i in range(subvendorindex+1,len(parts)):
+ p = self.remove_quotes(parts[i])
+ if p[0] != '-':
+ subdeviceindex = i
+ break
+
+ if subdeviceindex != -1:
+ try:
+ subdeviceid= self.remove_quotes(parts[subdeviceindex])
+ subdeviceid= long(subdeviceid,16)
+ except IndexError:
+ print( "Skipping invalid line:", string.strip(line) )
+ continue
+ except ValueError, e:
+ print( "Skipping invalid line:", string.strip(line) )
+ continue
+
+ full_id= (vendorid,deviceid,subvendorid,subdeviceid)
+ module = all_pci_ids.get(full_id, None)
+ if module is None:
+ continue
+
+ if classid == self.PCI_CLASS_NETWORK:
+ network_mods.append(module[0])
+ elif classid in (self.PCI_CLASS_RAID,
+ self.PCI_CLASS_RAID2,
+ self.PCI_CLASS_IDE):
+ scsi_mods.append(module[0])
+
system_mods[self.MODULE_CLASS_SCSI]= scsi_mods
system_mods[self.MODULE_CLASS_NETWORK]= network_mods
print ""
- modules= info.get_system_modules("/")
+
+ import sys
+ kernel_version = None
+ if len(sys.argv) > 2:
+ kernel_version = sys.argv[1]
+
+ modules= info.get_system_modules("/",kernel_version)
if not modules:
print "unable to list system modules"
else:
git://git.onelab.eu / bootmanager.git / blobdiff