Skip to content

Commit 96ff3ec

Browse files
committed
fixed autodetected kmods not being uatoloaded
Signed-off-by: Zen <[email protected]>
1 parent 68cba76 commit 96ff3ec

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ugrd/kmod/kmod.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__author__ = 'desultory'
2-
__version__ = '0.9.1'
2+
__version__ = '1.0.0'
33

44
from pathlib import Path
55
from subprocess import run
@@ -206,22 +206,24 @@ def calculate_modules(self) -> None:
206206
Populates the kernel_modules list with all required kernel modules.
207207
If kmod_autodetect_lsmod is set, adds the contents of lsmod if specified.
208208
If kmod_autodetect_lspci is set, adds the contents of lspci -k if specified.
209+
Autodetected modules are added to kmod_init
210+
209211
Adds the contents of _kmod_depend if specified.
210212
Performs dependency resolution on all kernel modules.
211213
"""
212214
if self.config_dict['kmod_autodetect_lsmod']:
213215
autodetected_modules = get_lsmod_modules(self)
214216
self.logger.info("Autodetected kernel modules from lsmod: %s" % autodetected_modules)
215-
self.config_dict['kernel_modules'] = autodetected_modules
217+
self.config_dict['kmod_init'] = autodetected_modules
216218

217219
if self.config_dict['kmod_autodetect_lspci']:
218220
autodetected_modules = get_lspci_modules(self)
219221
self.logger.info("Autodetected kernel modules from lscpi -k: %s" % autodetected_modules)
220-
self.config_dict['kernel_modules'] = autodetected_modules
222+
self.config_dict['kmod_init'] = autodetected_modules
221223

222224
if self.config_dict['_kmod_depend']:
223225
self.logger.info("Adding internal dependencies to kmod_init: %s" % self.config_dict['_kmod_depend'])
224-
self.config_dict['kmod_init'] = self.config_dict['_kmod_depend'].copy() # Copy because _kmood_depend may shrink during iteration
226+
self.config_dict['kmod_init'] = self.config_dict['_kmod_depend'].copy() # Copy because _kmod_depend may shrink during iteration
225227

226228
self.logger.info("Included kernel modules: %s" % self.config_dict['kernel_modules'])
227229

0 commit comments

Comments
 (0)