From 010f7ba752caa975e74b131f1b289082dabc3a6d Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Thu, 20 Nov 2008 20:48:16 +0000 Subject: [PATCH] Use the PCI slot to order the interfaces. --- source/systeminfo.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/systeminfo.py b/source/systeminfo.py index 6fb6ff2..25f5ea6 100755 --- a/source/systeminfo.py +++ b/source/systeminfo.py @@ -46,9 +46,6 @@ DEVICES_SCANNED_FLAG= "/tmp/devices_scanned" BLOCKS_PER_GB = pow(10, 9) / 1024.0; -# -n is numeric ids (no lookup), -m is machine readable -LSPCI_CMD= "/sbin/lspci -nm" - MODULE_CLASS_NETWORK= "network" MODULE_CLASS_SCSI= "scsi" @@ -280,7 +277,8 @@ def get_system_modules( vars = {}, log = sys.stderr): # XXX: this is really similar to what BootCD/conf_files/pl_hwinit does. merge? pcidevs = get_devices() - for (slot, dev) in pcidevs.iteritems(): + for slot in sorted(pcidevs.keys()): + dev = pcidevs[slot] base = (dev[4] & 0xff0000) >> 16 if base not in (PCI_BASE_CLASS_STORAGE, PCI_BASE_CLASS_NETWORK): -- 2.43.0