Skip to content

Commit

Permalink
Merge pull request #2315 from eugenesan/i2311
Browse files Browse the repository at this point in the history
Mirror GRUB's splash screen functionality for non-grub booloaders
  • Loading branch information
adriaandegroot committed Apr 12, 2024
2 parents 1645874 + 51d6dd2 commit d9fceac
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/modules/bootloader/main.py
Expand Up @@ -127,7 +127,6 @@ def is_zfs_root(partition):

def get_kernel_params(uuid):
kernel_params = libcalamares.job.configuration.get("kernelParams", ["quiet"])
kernel_params.append("rw")

partitions = libcalamares.globalstorage.value("partitions")
swap_uuid = ""
Expand All @@ -136,11 +135,17 @@ def get_kernel_params(uuid):

cryptdevice_params = []

has_plymouth = libcalamares.utils.target_env_call(["sh", "-c", "which plymouth"]) == 0
has_dracut = libcalamares.utils.target_env_call(["sh", "-c", "which dracut"]) == 0
uses_systemd_hook = libcalamares.utils.target_env_call(["sh", "-c",
"grep -q \"^HOOKS.*systemd\" /etc/mkinitcpio.conf"]) == 0
use_systemd_naming = has_dracut or uses_systemd_hook

# If plymouth installed, add splash screen parameter early
if has_plymouth:
kernel_params.append("splash")

kernel_params.append("rw")

# Take over swap settings:
# - unencrypted swap partition sets swap_uuid
Expand Down

0 comments on commit d9fceac

Please sign in to comment.