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

[bootloader] Avoid indirection through shell

Browse Source 
There's no need to run the shell to take apart the arguments to grep.
This commit is contained in:
Adriaan de Groot 2024-04-12 21:55:26 +02:00
parent b8049daa45
commit b4edf52198
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,8 +142,7 @@ def get_kernel_params(uuid):
has_plymouth = have_program_in_target("plymouth") has_plymouth = have_program_in_target("plymouth")
has_dracut = have_program_in_target("dracut") has_dracut = have_program_in_target("dracut")
uses_systemd_hook = libcalamares.utils.target_env_call(["sh", "-c", uses_systemd_hook = libcalamares.utils.target_env_call(["/usr/bin/grep", "-q", "^HOOKS.*systemd", "/etc/mkinitcpio.conf"]) == 0
"grep -q \"^HOOKS.*systemd\" /etc/mkinitcpio.conf"]) == 0
use_systemd_naming = has_dracut or uses_systemd_hook use_systemd_naming = has_dracut or uses_systemd_hook
# If plymouth installed, add splash screen parameter early # If plymouth installed, add splash screen parameter early