X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=blobdiff_plain;f=initscripts%2Fpl_hwinit;h=8224a9e4b505036856783a39de1c0bfe77713890;hp=7985511c1425a374213cc6b629bb23f080d0634b;hb=5c7527aa84590ea6b852d4cb1e3be0899351387c;hpb=e906856a46215cbdadab4476e0649fc783c94893 diff --git a/initscripts/pl_hwinit b/initscripts/pl_hwinit index 7985511..8224a9e 100755 --- a/initscripts/pl_hwinit +++ b/initscripts/pl_hwinit @@ -6,16 +6,17 @@ import pypcimap import os import time -loadedmodules = None - def now(): - format="%H:%M:%S(%Z)" - return time.strftime(format,time.localtime()) + format = "%H:%M:%S(%Z)" + return time.strftime(format, time.localtime()) + +def verbose_message(single): + print now(), single -def modprobe(module, args = ""): - ret = os.system("/sbin/modprobe %s %s" % (module, args)) +def modprobe(module, summary_file, args = ""): + ret = os.system("/sbin/modprobe {} {}".format(module, args)) if os.WEXITSTATUS(ret) == 0: - globals()['loadedmodules'].write("%s\n" % module) + summary_file.write("{}\n".format(module)) return True else: return False @@ -29,12 +30,12 @@ def main(argv): if os.path.exists(kernel): path = kernel else: - path = "/lib/modules/%s/modules.pcimap" % kernel + path = "/lib/modules/{}/modules.pcimap".format(kernel) blacklisted_modules = [] blacklists = os.listdir("/etc/modprobe.d") for blacklist in blacklists: - blf = "/etc/modprobe.d/%s" % blacklist + blf = "/etc/modprobe.d/{}".format(blacklist) if os.path.exists(blf): f = open(blf) for i in f.readlines(): @@ -44,54 +45,56 @@ def main(argv): blacklisted_modules = list(set(blacklisted_modules)) pcimap = pypcimap.PCIMap(path) - print now(),"pl_hwinit: loading applicable modules" + verbose_message("pl_hwinit: loading applicable modules") devices = pypci.get_devices() storage_devices = 0 network_devices = 0 missing = [] - globals()['loadedmodules'] = file('/tmp/loadedmodules', 'w') - for slot in sorted(devices.keys()): - dev = devices[slot] - modules = pcimap.get(dev) - base = (dev[4] & 0xff0000) >> 16 - if len(modules) == 0: - 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: - if module not in blacklisted_modules: - print now(),"pl_hwinit: found and loading module %s (%s)" % (module, slot) - modprobe(module) - - if network_devices == 0: - print now(),"pl_hwinit: no supported network devices found!" - print now(),"pl_hwinit: the following devices were found, but have no driver:" - print now(),"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 now(),"pl_hwinit: loading sd_mod" - modprobe("sd_mod") - - # load usb_storage to support node conf files on flash disks - print now(),"pl_hwinit: loading usb_storage" - modprobe("usb_storage") - - print now(),"pl_hwinit: loading floppy device driver" - modprobe("floppy","floppy=0,allowed_drive_mask") + with open('/tmp/loadedmodules', 'w') as loadedmodules: + for slot in sorted(devices.keys()): + dev = devices[slot] + modules = pcimap.get(dev) + base = (dev[4] & 0xff0000) >> 16 + if len(modules) == 0: + 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: + if module not in blacklisted_modules: + verbose_message("pl_hwinit: found and loading module {} (%s)" % (module, slot)) + modprobe(module, loadedmodules) + + if network_devices == 0: + verbose_message("pl_hwinit: no supported network devices found!") + verbose_message("pl_hwinit: the following devices were found, but have no driver:") + lines = [ "{} x {}".format(slot, dev) for slot, dev in missing ] + for line in lines: + verbose_message("pl_hwinit: missing " + line) + + # XXX: could check for storage devices too, but older kernels have a lot of that built-in + + # sd_mod won't get loaded automatically + verbose_message("pl_hwinit: loading sd_mod") + modprobe("sd_mod", loadedmodules) + + # load usb_storage to support node conf files on flash disks + verbose_message("pl_hwinit: loading usb_storage") + modprobe("usb_storage", loadedmodules) + + verbose_message("pl_hwinit: loading floppy device driver") + modprobe("floppy", loadedmodules, "floppy=0,allowed_drive_mask") # always wait a bit between loading the usb drivers, and checking /sys/ # for usb devices (this isn't necessarily for waiting for mass storage files, # that is done below) - print now(),"pl_hwinit: waiting for usb system to initialize." + verbose_message("pl_hwinit: waiting for usb system to initialize.") time.sleep(10) # sometimes, flash devices take a while to initialize. in fact, the kernel @@ -132,15 +135,15 @@ def main(argv): os.path.walk("/sys/devices", filter_and_add, wait_dev_list) if len(wait_dev_list) > 0: - print now(),"pl_hwinit: found USB mass storage device(s). Attempting to wait" - print now(),"pl_hwinit: up to %d seconds for them to come online." % MAX_USB_WAIT_TIME + verbose_message("pl_hwinit: found USB mass storage device(s). Attempting to wait") + verbose_message("pl_hwinit: up to %d seconds for them to come online." % MAX_USB_WAIT_TIME) total_wait_time = 0 success = False while total_wait_time < MAX_USB_WAIT_TIME: total_wait_time += PER_CHECK_USB_WAIT_TIME - print now(),"pl_hwinit: waiting %d seconds." % PER_CHECK_USB_WAIT_TIME + verbose_message("pl_hwinit: waiting {} seconds.".format(PER_CHECK_USB_WAIT_TIME)) time.sleep(PER_CHECK_USB_WAIT_TIME) all_devices_online = True @@ -150,17 +153,17 @@ def main(argv): if all_devices_online: success = True - print now(),"pl_hwinit: looks like the devices are now online." + verbose_message("pl_hwinit: looks like the devices are now online.") break else: - print now(),"pl_hwinit: not all devices online yet, waiting..." + verbose_message("pl_hwinit: not all devices online yet, waiting...") if success: - print now(),"pl_hwinit: Succesfully waited for USB mass storage devices" - print now(),"pl_hwinit: to come online." + verbose_message("pl_hwinit: Succesfully waited for USB mass storage devices") + verbose_message("pl_hwinit: to come online.") else: - print now(),"pl_hwinit: One or more USB mass storage devices did not" - print now(),"pl_hwinit: initialize in time. Continuing anyway." + verbose_message("pl_hwinit: One or more USB mass storage devices did not") + verbose_message("pl_hwinit: initialize in time. Continuing anyway.") if __name__ == "__main__": main(sys.argv[1:])