From 9f8b848631faa02ab04c3c280b0e970c0172b049 Mon Sep 17 00:00:00 2001 From: Boria138 Date: Sat, 19 Aug 2023 15:29:49 +0600 Subject: [PATCH] uses_sd-encrypt was changed to uses_sd_encrypt to make it a valid variable name --- src/modules/bootloader/main.py | 4 ++-- src/modules/grubcfg/main.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index f29ff839e..b128e4e62 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -137,7 +137,7 @@ def get_kernel_params(uuid): cryptdevice_params = [] have_dracut = libcalamares.utils.target_env_call(["sh", "-c", "which dracut"]) == 0 - uses_sd-encrypt = libcalamares.utils.target_env_call(["sh", "-c", "grep -q sd-encrypt /etc/mkinitcpio.conf"]) + uses_sd_encrypt = libcalamares.utils.target_env_call(["sh", "-c", "grep -q sd-encrypt /etc/mkinitcpio.conf"]) # Take over swap settings: # - unencrypted swap partition sets swap_uuid @@ -155,7 +155,7 @@ def get_kernel_params(uuid): swap_outer_uuid = partition["luksUuid"] if partition["mountPoint"] == "/" and has_luks: - if have_dracut or uses_sd-encrypt: + if have_dracut or uses_sd_encrypt: cryptdevice_params = [f"rd.luks.uuid={partition['luksUuid']}"] else: cryptdevice_params = [f"cryptdevice=UUID={partition['luksUuid']}:{partition['luksMapperName']}"] diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 345c19663..e63214eaf 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -141,7 +141,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): # Shell exit value 0 means success have_plymouth = plymouth_bin == 0 have_dracut = dracut_bin == 0 - uses_sd-encrypt = mkinitcpio_systemd == 0 + uses_sd_encrypt = mkinitcpio_systemd == 0 use_splash = "" swap_uuid = "" @@ -162,7 +162,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): cryptdevice_params = [] - if have_dracut or used_sd-encrypt: + if have_dracut or used_sd_encrypt: for partition in partitions: if partition["fs"] == "linuxswap" and not partition.get("claimed", None): # Skip foreign swap