Fix filter_kernel_modules()

Make sure we skip the include/exclude logic if no filters are defined.

diff --git a/mkosi/kmod.py b/mkosi/kmod.py
index 22bc35074dfc40eaae6b6ea09fd308cc41a93301..742238884494ee38525c0969691d8443731b0582 100644 (file)
--- a/mkosi/kmod.py
+++ b/mkosi/kmod.py
@@ -29,23 +29,24 @@ def filter_kernel_modules(
         include = [*include, *loaded_modules()]
 
     keep = set()
-
-    regex = re.compile("|".join(include))
-    for m in modules:
-        rel = os.fspath(m.relative_to(modulesd / "kernel"))
-        if regex.search(rel):
-            logging.debug(f"Including module {rel}")
-            keep.add(rel)
-
-    regex = re.compile("|".join(exclude))
-    remove = set()
-    for m in modules:
-        rel = os.fspath(m.relative_to(modulesd / "kernel"))
-        if rel not in keep and regex.search(rel):
-            logging.debug(f"Excluding module {rel}")
-            remove.add(m)
-
-    modules -= remove
+    if include:
+        regex = re.compile("|".join(include))
+        for m in modules:
+            rel = os.fspath(m.relative_to(modulesd / "kernel"))
+            if regex.search(rel):
+                logging.debug(f"Including module {rel}")
+                keep.add(rel)
+
+    if exclude:
+        remove = set()
+        regex = re.compile("|".join(exclude))
+        for m in modules:
+            rel = os.fspath(m.relative_to(modulesd / "kernel"))
+            if rel not in keep and regex.search(rel):
+                logging.debug(f"Excluding module {rel}")
+                remove.add(m)
+
+        modules -= remove
 
     return sorted(modules)