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

[bootloader] Group local variables

Browse Source 
Put the constants -- do we use systemd, what are the partitions --
together, and put the things-set-by-the-loop together.
This commit is contained in:
Adriaan de Groot 2024-04-12 22:08:54 +02:00
parent 6d242b67f9
commit f6cd82f9a4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,17 +138,15 @@ def get_kernel_params(uuid):
kernel_params.append("splash")
kernel_params.append("rw")
use_systemd_naming = have_program_in_target("dracut") or (libcalamares.utils.target_env_call(["/usr/bin/grep", "-q", "^HOOKS.*systemd", "/etc/mkinitcpio.conf"]) == 0)
partitions = libcalamares.globalstorage.value("partitions")
cryptdevice_params = []
swap_uuid = ""
swap_outer_mappername = None
swap_outer_uuid = None
cryptdevice_params = []
has_dracut = have_program_in_target("dracut")
uses_systemd_hook = libcalamares.utils.target_env_call(["/usr/bin/grep", "-q", "^HOOKS.*systemd", "/etc/mkinitcpio.conf"]) == 0
use_systemd_naming = has_dracut or uses_systemd_hook
# Take over swap settings:
# - unencrypted swap partition sets swap_uuid
# - encrypted root sets cryptdevice_params