Fix setup when /sys/block is inaccessible

57cac788 · Daniel Hokka Zakrisson · 5ba090c3 · 57cac788
Commit 57cac788 authored Feb 11, 2013 by Daniel Hokka Zakrisson
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

library/setup
+6 -1

No files found.
--- a/library/setup
+++ b/library/setup
@@ -381,7 +381,12 @@ class LinuxHardware(Hardware):
        if lspci:
            rc, pcidata, err = module.run_command(lspci)

-        for block in os.listdir("/sys/block"):
+        try:
+            block_devs = os.listdir("/sys/block")
+        except OSError:
+            return
+
+        for block in block_devs:
            virtual = 0
            sysfs_no_links = 0
            try: