From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 21 Nov 2007 03:10:19 +0000 (+0000)
Subject: Check for supported network devices, and warn if none are present (make it an error?).
X-Git-Tag: bootcd-3.4-2~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=52c242cd964a121455af34d32089927c93495261;p=bootcd.git

Check for supported network devices, and warn if none are present (make it an error?).
---

diff --git a/conf_files/pl_hwinit b/conf_files/pl_hwinit
index 8654708..b1fc6f0 100755
--- a/conf_files/pl_hwinit
+++ b/conf_files/pl_hwinit
@@ -24,19 +24,34 @@ def main(argv):
     pcimap = pypcimap.PCIMap(path)
     print "pl_hwinit: loading applicable modules"
     devices = pypciscan.get_devices()
+    storage_devices = 0
+    network_devices = 0
     missing = []
     for (slot, dev) in devices.iteritems():
         modules = pcimap.get(dev)
+        base = (dev[4] & 0xff00) >> 8
         if len(modules) == 0:
-            base = (dev[4] & 0xff00) >> 8
             if base == 0x01 or base == 0x02:
                 # storage or network device, in that order
                 missing.append((slot, dev))
         else:
+            if base == 0x01:
+                storage_devices += 1
+            elif base == 0x02:
+                network_devices += 1
+
             # FIXME: This needs improved logic in the case of multiple matching modules
             for module in modules:
+                print "pl_hwinit: found and loading module %s (%s)" % (module, slot)
                 modprobe(module)
 
+    if network_devices == 0:
+        print "pl_hwinit: no supported network devices found!"
+        print "pl_hwinit: the following devices were found, but have no driver:"
+        print "pl_hwinit: ", "\npl_hwinit: ".join(missing)
+
+    # XXX: could check for storage devices too, but older kernels have a lot of that built-in
+
     # sd_mod won't get loaded automatically
     print "pl_hwinit: loading sd_mod"
     modprobe("sd_mod")