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

Revert "[modules] work on #797 and #796"

Browse Source 
This reverts commit 80a1286833.
This commit is contained in:
Philip 2017-09-14 08:11:19 -04:00
parent 6560494bff
commit db4bbde6a1
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
# - encrypted root sets cryptdevice_params # - encrypted root sets cryptdevice_params
for partition in partitions: for partition in partitions:
has_luks = "luksMapperName" in partition has_luks = "luksMapperName" in partition
if partition["fs"].lower().replace("-","") == "linuxswap" and not has_luks: if partition["fs"].lower().strip("-") == "linuxswap" and not has_luks:
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if partition["mountPoint"] == "/" and has_luks: if partition["mountPoint"] == "/" and has_luks:

6
src/modules/grubcfg/main.py
View File

@ -60,10 +60,10 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if have_dracut: if have_dracut:
for partition in partitions: for partition in partitions:
has_luks = "luksMapperName" in partition has_luks = "luksMapperName" in partition
if partition["fs"].lower().replace("-","") == "linuxswap" and not has_luks: if partition["fs"].lower().strip("-") == "linuxswap" and not has_luks:
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if (partition["fs"].lower().replace("-","") == "linuxswap" and has_luks): if (partition["fs"].lower().strip("-") == "linuxswap" and has_luks):
swap_outer_uuid = partition["luksUuid"] swap_outer_uuid = partition["luksUuid"]
swap_outer_mappername = partition["luksMapperName"] swap_outer_mappername = partition["luksMapperName"]
@ -74,7 +74,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
else: else:
for partition in partitions: for partition in partitions:
has_luks = "luksMapperName" in partition has_luks = "luksMapperName" in partition
if partition["fs"].lower().replace("-","") == "linuxswap" and not has_luks: if partition["fs"].lower().strip("-") == "linuxswap" and not has_luks:
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if (partition["mountPoint"] == "/" and has_luks): if (partition["mountPoint"] == "/" and has_luks):

2
src/modules/initcpiocfg/main.py
View File

@ -114,7 +114,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
hooks.append("plymouth") hooks.append("plymouth")
for partition in partitions: for partition in partitions:
if partition["fs"].lower().replace("-","") == "linuxswap": if partition["fs"].lower().strip("-") == "linuxswap":
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if "luksMapperName" in partition: if "luksMapperName" in partition:
openswap_hook = True openswap_hook = True

2
src/modules/luksbootkeyfile/main.py
View File

@ -47,7 +47,7 @@ def run():
luks_root_device = partition["device"] luks_root_device = partition["device"]
luks_root_passphrase = partition["luksPassphrase"] luks_root_passphrase = partition["luksPassphrase"]
elif "luksMapperName" in partition and\ elif "luksMapperName" in partition and\
(partition["mountPoint"] or partition["fs"].lower().replace("-","") == "linuxswap"): (partition["mountPoint"] or partition["fs"].lower().strip("-") == "linuxswap"):
additional_luks_devices.append((partition["device"], additional_luks_devices.append((partition["device"],
partition["luksPassphrase"])) partition["luksPassphrase"]))

2
src/modules/luksopenswaphookcfg/main.py
View File

@ -30,7 +30,7 @@ def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
mountable_keyfile_device = "" mountable_keyfile_device = ""
for partition in partitions: for partition in partitions:
if partition["fs"].lower().replace("-","") == "linuxswap" and "luksMapperName" in partition: if partition["fs"].lower().strip("-") == "linuxswap" and "luksMapperName" in partition:
swap_outer_uuid = partition["luksUuid"] swap_outer_uuid = partition["luksUuid"]
swap_mapper_name = partition["luksMapperName"] swap_mapper_name = partition["luksMapperName"]