Merge pull request #227 from valentindavid/valentindavid/fix-module-n…

…ame-walking ubuntu-core-initramfs: Fix discovery of compressed modules
canonical · Jan 9, 2024 · 12b79fb · 12b79fb
2 parents bd110f4 + 41b9e14
commit 12b79fb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/bin/ubuntu-core-initramfs b/bin/ubuntu-core-initramfs
@@ -80,9 +80,13 @@ class ModuleDb:
 
         for root, dirs, files in os.walk(module_path):
             for f in files:
-                name, ext = os.path.splitext(f)
-                if ext == '.ko':
-                    self._modules[name] = ModuleDb.ModuleInfo(False, [], [])
+                if f.endswith('.ko'):
+                    name, _ = os.path.splitext(f)
+                elif '.ko.' in f:
+                    name, _ = f.split('.ko.', maxsplit=1)
+                else:
+                    continue
+                self._modules[name] = ModuleDb.ModuleInfo(False, [], [])
 
         for alias, target in ModuleDb.__each_alias(os.path.join(module_path, "modules.alias")):
             try: