From fcc23b98d2c379ca2285a12304b89b77e8b259a4 Mon Sep 17 00:00:00 2001 From: Philip Date: Tue, 12 Sep 2017 06:34:02 -0400 Subject: [PATCH] [modules] work on #797 and #796 --- src/modules/bootloader/main.py | 2 +- src/modules/grubcfg/main.py | 6 +++--- src/modules/initcpiocfg/main.py | 2 +- src/modules/luksbootkeyfile/main.py | 2 +- src/modules/luksopenswaphookcfg/main.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 4d3d51f46..48a1f6510 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -111,7 +111,7 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line): # - encrypted root sets cryptdevice_params for partition in partitions: has_luks = "luksMapperName" in partition - if partition["fs"].lower().lstrip("-") == "linuxswap" and not has_luks: + if partition["fs"].lower().strip("-") == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] if partition["mountPoint"] == "/" and has_luks: diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 0a82c4313..5f1efce57 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -60,10 +60,10 @@ def modify_grub_default(partitions, root_mount_point, distributor): if have_dracut: for partition in partitions: has_luks = "luksMapperName" in partition - if partition["fs"].lower().lstrip("-") == "linuxswap" and not has_luks: + if partition["fs"].lower().strip("-") == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] - if (partition["fs"].lower().lstrip("-") == "linuxswap" and has_luks): + if (partition["fs"].lower().strip("-") == "linuxswap" and has_luks): swap_outer_uuid = partition["luksUuid"] swap_outer_mappername = partition["luksMapperName"] @@ -74,7 +74,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): else: for partition in partitions: has_luks = "luksMapperName" in partition - if partition["fs"].lower().lstrip("-") == "linuxswap" and not has_luks: + if partition["fs"].lower().strip("-") == "linuxswap" and not has_luks: swap_uuid = partition["uuid"] if (partition["mountPoint"] == "/" and has_luks): diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index 1e9b9604a..c6b025802 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -114,7 +114,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): hooks.append("plymouth") for partition in partitions: - if partition["fs"].lower().lstrip("-") == "linuxswap": + if partition["fs"].lower().strip("-") == "linuxswap": swap_uuid = partition["uuid"] if "luksMapperName" in partition: openswap_hook = True diff --git a/src/modules/luksbootkeyfile/main.py b/src/modules/luksbootkeyfile/main.py index 037890da3..e2e3f11e5 100644 --- a/src/modules/luksbootkeyfile/main.py +++ b/src/modules/luksbootkeyfile/main.py @@ -47,7 +47,7 @@ def run(): luks_root_device = partition["device"] luks_root_passphrase = partition["luksPassphrase"] elif "luksMapperName" in partition and\ - (partition["mountPoint"] or partition["fs"].lower().lstrip("-") == "linuxswap"): + (partition["mountPoint"] or partition["fs"].lower().strip("-") == "linuxswap"): additional_luks_devices.append((partition["device"], partition["luksPassphrase"])) diff --git a/src/modules/luksopenswaphookcfg/main.py b/src/modules/luksopenswaphookcfg/main.py index 0721e5504..b2174dcfa 100644 --- a/src/modules/luksopenswaphookcfg/main.py +++ b/src/modules/luksopenswaphookcfg/main.py @@ -30,7 +30,7 @@ def write_openswap_conf(partitions, root_mount_point, openswap_conf_path): mountable_keyfile_device = "" for partition in partitions: - if partition["fs"].lower().lstrip("-") == "linuxswap" and "luksMapperName" in partition: + if partition["fs"].lower().strip("-") == "linuxswap" and "luksMapperName" in partition: swap_outer_uuid = partition["luksUuid"] swap_mapper_name = partition["luksMapperName"]