Skip to content

Commit f350a11

Browse files
authored
Merge pull request #353 from desultory/posix
remove bashisms, black format
2 parents 10dde08 + dc30a0c commit f350a11

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/ugrd/kmod/kmod.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,12 @@ def _process_kernel_version(self, kver: str) -> None:
330330
if not kmod_dir.exists():
331331
# If no_kmod is set, log a warning and continue
332332
if self["no_kmod"]:
333-
return self.logger.warning("[%s] Kernel module directory does not exist, but no_kmod is set, continuing." % kver)
334-
elif not Path("/lib/modules").exists(): # If /lib/modules doesn't exist, assume no_kmod is true because no kmods are installed
333+
return self.logger.warning(
334+
"[%s] Kernel module directory does not exist, but no_kmod is set, continuing." % kver
335+
)
336+
elif not Path(
337+
"/lib/modules"
338+
).exists(): # If /lib/modules doesn't exist, assume no_kmod is true because no kmods are installed
335339
self.logger.critical(f"/lib/modules directory does not exist, assuming {c_('no_kmod', 'blue')}=true.")
336340
self["no_kmod"] = True
337341
return
@@ -639,13 +643,14 @@ def process_modules(self) -> None:
639643
self.logger.warning("[%s] Failed to process autodetected kernel module dependencies: %s" % (kmod, e))
640644
self["kmod_ignore"] = kmod
641645

646+
642647
@contains("kernel_version", "Kernel version is not set, skipping kernel version check.", log_level=30)
643648
def check_kver(self) -> str:
644-
""" Returns shell lines to check that the defined kernel version matches the running kernel version."""
649+
"""Returns poxixshell lines to check that the defined kernel version matches the running kernel version."""
645650
return f"""
646651
running_kver=$(awk '{{print $3}}' /proc/version)
647-
if [[ "$running_kver" != "{self['kernel_version']}" ]]; then
648-
eerror "Running kernel version ($running_kver) does not match the defined kernel version ({self['kernel_version']})"
652+
if [ "$running_kver" != "{self["kernel_version"]}" ]; then
653+
eerror "Running kernel version ($running_kver) does not match the defined kernel version ({self["kernel_version"]})"
649654
eerror "Please ensure the correct kernel version is being booted."
650655
fi
651656
"""

0 commit comments

Comments
 (0)