Skip to content

Commit b3cfa48

Browse files
committed
improved kmod checks
Signed-off-by: Zen <[email protected]>
1 parent e42105f commit b3cfa48

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/ugrd/kmod/kmod.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def calculate_modules(self) -> None:
160160
self['kmod_init'] = autodetected_modules
161161

162162

163-
@check_dict('kmod_init', message="kmod_init is not set, skipping.", log_level=30)
163+
@check_dict('kmod_init', not_empty=True, message="kmod_init is not set, skipping.", log_level=30)
164164
def process_module_metadata(self) -> None:
165165
""" Adds kernel module metadata files to dependencies."""
166166
module_path = Path('/lib/modules/') / self['kernel_version']
@@ -248,13 +248,7 @@ def process_modules(self) -> None:
248248
@check_dict('kmod_init', not_empty=True, message="No kernel modules to load", log_level=30)
249249
def load_modules(self) -> None:
250250
""" Creates a bash script which loads all kernel modules in kmod_init. """
251-
# Start by using the kmod_init variable
252-
if not self['kmod_init']:
253-
self.logger.error("No kernel modules to load")
254-
return
255-
256251
self.logger.info("Init kernel modules: %s" % self['kmod_init'])
257252
self.logger.warning("Ignored kernel modules: %s" % self['_kmod_removed'])
258-
259253
return f"modprobe -av {' '.join(self['kmod_init'])}"
260254

0 commit comments

Comments
 (0)