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

[bootloader] Factor out running "which" in target

Browse Source 
which is an actual program, drop the round-about via shell
This commit is contained in:
Adriaan de Groot 2024-04-12 21:39:50 +02:00
parent d9fceac06e
commit b8049daa45
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,11 @@ def is_zfs_root(partition):
return partition["mountPoint"] == "/" and partition["fs"] == "zfs" return partition["mountPoint"] == "/" and partition["fs"] == "zfs"
def have_program_in_target(program : str):
"""Returns @c True if @p program is in path in the target"""
return libcalamares.utils.target_env_call(["/usr/bin/which", program]) == 0
def get_kernel_params(uuid): def get_kernel_params(uuid):
kernel_params = libcalamares.job.configuration.get("kernelParams", ["quiet"]) kernel_params = libcalamares.job.configuration.get("kernelParams", ["quiet"])
@ -135,8 +140,8 @@ def get_kernel_params(uuid):
cryptdevice_params = [] cryptdevice_params = []
has_plymouth = libcalamares.utils.target_env_call(["sh", "-c", "which plymouth"]) == 0 has_plymouth = have_program_in_target("plymouth")
has_dracut = libcalamares.utils.target_env_call(["sh", "-c", "which dracut"]) == 0 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(["sh", "-c",
"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