some more groundwork

aif/disk/block_fallback.py

@@ -3,9 +3,7 @@
 # https://github.com/dcantrell/pyparted/blob/master/examples/query_device_capacity.py
 # TODO: Remember to replicate genfstab behaviour.
 
-import os
 import re
-import subprocess
 try:
     # https://stackoverflow.com/a/34812552/733214
     # https://github.com/karelzak/util-linux/blob/master/libmount/python/test_mount_context.py#L6
@@ -14,7 +12,6 @@ except ImportError:
     # We should never get here. util-linux is part of core (base) in Arch and uses "libmount".
     import pylibmount as mount
 ##
-# import blkinfo
 import parted  # https://www.gnu.org/software/parted/api/index.html
 import psutil
 ##

aif/disk/filesystem_fallback.py

@@ -25,20 +25,24 @@ _mod_dir = os.path.join('/lib/modules',
                         os.uname().release,
                         'kernel/fs')
 _strip_mod_suffix = re.compile(r'(?P<fsname>)\.ko(\.(x|g)?z)?$', re.IGNORECASE)
-for i in os.listdir(_mod_dir):
-    path = os.path.join(_mod_dir, i)
-    fs_name = None
-    if os.path.isdir(path):
-        fs_name = i
-    elif os.path.isfile(path):
-        mod_name = _strip_mod_suffix.search(i)
-        fs_name = mod_name.group('fsname')
-    if fs_name:
-        # The kernel *probably* has autoloading enabled, but in case it doesn't...
-        # TODO: logging!
-        if os.getuid() == 0:
-            subprocess.run(['modprobe', fs_name])
-            FS_FSTYPES.append(fs_name)
+try:
+    for i in os.listdir(_mod_dir):
+        path = os.path.join(_mod_dir, i)
+        fs_name = None
+        if os.path.isdir(path):
+            fs_name = i
+        elif os.path.isfile(path):
+            mod_name = _strip_mod_suffix.search(i)
+            fs_name = mod_name.group('fsname')
+        if fs_name:
+            # The kernel *probably* has autoloading enabled, but in case it doesn't...
+            # TODO: logging!
+            if os.getuid() == 0:
+                subprocess.run(['modprobe', fs_name])
+                FS_FSTYPES.append(fs_name)
+except FileNotFoundError:
+    # We're running on a kernel that doesn't have modules
+    pass
 
 
 class FS(object):