fixed kmod autodetction ignoring, added nonetwork module

Signed-off-by: Zen <[email protected]>

Author: desultory

readme.md

@@ -223,9 +223,9 @@ The following parameters can be used to change the kernel module pulling and ini
 
 Some helper modules have been created to make importing required kernel modules easier.
 
-`base.ugrd.kmod_nvme`, `kmod_usb`, and `kmod_fat` can be used to load modules for NVME's, USB storage, and the FAT file system respectively.
+`ugrd.kmod.nvme`, `usb`, and `fat` can be used to load modules for NVME's, USB storage, and the FAT file system respectively.
 
-Similarly `base.ugrd.kmod_novideo` and `kmod_nosound` exist to ignore video and sound devices that may appear when autodetecting modules.
+Similarly `ugrd.kmod.novideo` `nonetwork`, and `nosound` exist to ignore video, network, and sound devices that may appear when autodetecting modules.
 
 ### Filesystem modules
 

ugrd/kmod/kmod.py

@@ -30,6 +30,19 @@ def _process_kmod_ignore(self, module: str) -> None:
             self[key].remove(module)
 
 
+def _process_kernel_modules_multi(self, module: str) -> None:
+    """
+    Adds the passed kernel module to self['kernel_modules']
+    Checks if the module is ignored
+    """
+    if module in self['kmod_ignore']:
+        self.logger.warning("Not adding ignored kernel module to kernel_modules: %s" % module)
+        return
+
+    self.logger.debug("Adding kernel module to kernel_modules: %s", module)
+    self['kernel_modules'].append(module)
+
+
 def _process_kmod_init_multi(self, module: str) -> None:
     """
     Adds init modules to self['kernel_modules'].
@@ -113,7 +126,7 @@ def process_kmod(self, module: str):
 
     if firmware := modinfo.get('firmware'):
         if self.config_dict.get('kmod_pull_firmware'):
-            self.logger.info("Adding firmware to dependencies: %s" % firmware)
+            self.logger.info("[%s] Adding firmware to dependencies: %s" % (module, firmware))
             for file in firmware:
                 try:
                     self.config_dict['dependencies'] = Path('/lib/firmware/') / file
@@ -149,7 +162,7 @@ def get_lspci_modules(self) -> list[str]:
     except RuntimeError as e:
         raise DependencyResolutionError("Failed to get list of kernel modules") from e
 
-    raw_modules = set()
+    modules = set()
     # Iterate over all output lines
     for line in cmd.stdout.decode('utf-8').split('\n'):
         # If the line contains the string 'Kernel modules:' or 'Kernel driver in use:', it contains the name of a kernel module
@@ -158,13 +171,13 @@ def get_lspci_modules(self) -> list[str]:
             if ',' in module:
                 # If there are multiple modules, split them and add them to the module set
                 for module in module.split(','):
-                    raw_modules.add(module.strip())
+                    modules.add(module.strip())
             else:
                 # Add the single module to the module set
-                raw_modules.add(module.strip())
+                modules.add(module.strip())
 
-    self.logger.debug("Kernel modules in use by hardware: %s" % raw_modules)
-    return list(raw_modules)
+    self.logger.debug("Kernel modules in use by hardware: %s" % modules)
+    return list(modules)
 
 
 def get_lsmod_modules(self) -> list[str]:
@@ -184,7 +197,7 @@ def get_lsmod_modules(self) -> list[str]:
         raise DependencyResolutionError('Failed to get list of kernel modules') from e
 
     raw_modules = cmd.stdout.decode('utf-8').split('\n')[1:]
-    modules = []
+    modules = set
     # Remove empty lines, header, and ignored modules
     for module in raw_modules:
         if not module:
@@ -193,10 +206,10 @@ def get_lsmod_modules(self) -> list[str]:
             self.logger.log(5, "Dropping header line")
         else:
             self.logger.debug("Adding kernel module: %s", module.split()[0])
-            modules.append(module.split()[0])
+            modules.add(module.split()[0])
 
     self.logger.debug(f'Found {len(modules)} active kernel modules')
-    return modules
+    return list(modules)
 
 
 def process_module_metadata(self) -> None:

ugrd/kmod/kmod.toml

@@ -18,7 +18,7 @@ _kmod_depend = "NoDupFlatList"  # Meant to be used internally, defines kernel mo
 _kmod_modinfo = "dict" # Used internally, caches modinfo output for kernel modules
 
 [imports.config_processing]
-"ugrd.kmod.kmod" = [ "_process_kmod_init_multi", "_process_kmod_ignore" ]
+"ugrd.kmod.kmod" = [ "_process_kmod_init_multi", "_process_kernel_modules_multi", "_process_kmod_ignore" ]
 
 [imports.build_pre]
 "ugrd.kmod.kmod" = [ "calculate_modules" ]

ugrd/kmod/nonetwork.toml

@@ -0,0 +1,3 @@
+mod_depends = ['ugrd.kmod.kmod']
+
+kmod_ignore = ['r8169', 'iwlwifi', 'r8169']