napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2315 from eugenesan/i2311

Browse Source 
Mirror GRUB's splash screen functionality for non-grub booloaders
This commit is contained in:
Adriaan de Groot 2024-04-12 21:36:37 +02:00 committed by GitHub
commit d9fceac06e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/bootloader/main.py
View File

@ -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 = ""
@ -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