Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/ugrd/kmod/kmod.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__author__ = "desultory"
__version__ = "4.1.0"
__version__ = "4.2.0"

from pathlib import Path
from platform import uname
Expand Down Expand Up @@ -624,6 +624,17 @@ def process_modules(self) -> None:
self.logger.warning("[%s] Failed to process autodetected kernel module dependencies: %s" % (kmod, e))
self["kmod_ignore"] = kmod

@contains("kernel_version", "Kernel version is not set, skipping kernel version check.", log_level=30)
def check_kver(self) -> str:
""" Returns shell lines to check that the defined kernel version matches the running kernel version."""
return f"""
running_kver=$(awk '{{print $3}}' /proc/version)
if [[ "$running_kver" != "{self['kernel_version']}" ]]; then
eerror "Running kernel version ($running_kver) does not match the defined kernel version ({self['kernel_version']})"
eerror "Please ensure the correct kernel version is being booted."
fi
"""


@contains("kmod_init", "No kernel modules to load.", log_level=30)
def load_modules(self) -> str:
Expand Down
2 changes: 1 addition & 1 deletion src/ugrd/kmod/kmod.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ kmod_no_normalize = "NoDupFlatList" # Kernel modules to not normalize (i.e. not
"ugrd.kmod.kmod" = [ "regen_kmod_metadata" ]

[imports.init_pre]
"ugrd.kmod.kmod" = [ "load_modules" ]
"ugrd.kmod.kmod" = [ "check_kver", "load_modules" ]