Skip to content

remove bashisms, black format #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 19, 2025
Merged

remove bashisms, black format #353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions src/ugrd/kmod/kmod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,12 @@ def _process_kernel_version(self, kver: str) -> None:
if not kmod_dir.exists():
# If no_kmod is set, log a warning and continue
if self["no_kmod"]:
return self.logger.warning("[%s] Kernel module directory does not exist, but no_kmod is set, continuing." % kver)
elif not Path("/lib/modules").exists(): # If /lib/modules doesn't exist, assume no_kmod is true because no kmods are installed
return self.logger.warning(
"[%s] Kernel module directory does not exist, but no_kmod is set, continuing." % kver
)
elif not Path(
"/lib/modules"
).exists(): # If /lib/modules doesn't exist, assume no_kmod is true because no kmods are installed
self.logger.critical(f"/lib/modules directory does not exist, assuming {c_('no_kmod', 'blue')}=true.")
self["no_kmod"] = True
return
Expand Down Expand Up @@ -639,13 +643,14 @@ 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."""
"""Returns poxixshell lines to check that the defined kernel version matches the running kernel version."""
Copy link

@WavyEbuilder WavyEbuilder Oct 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

poxix?

Copy link
Owner Author

@desultory desultory Oct 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idk how to type

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']})"
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
"""
Expand Down