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

[initcpiocfg] Use booleans for boolean values

Browse Source 
(as previous) Use False/True rather than ""/"yes" for
keeping track of does-the-system-use-lvm2.
This commit is contained in:
Adriaan de Groot 2021-09-21 12:54:18 +02:00
parent 7f7dc04e8d
commit 7c3c7c4ff7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
""" """
swap_uuid = "" swap_uuid = ""
uses_btrfs = False uses_btrfs = False
lvm2 = "" uses_lvm2 = False
hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard",
"keymap"] "keymap"]
modules = [] modules = []
@ -161,7 +161,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
uses_btrfs = True uses_btrfs = True
if "lvm2" in partition["fs"]: if "lvm2" in partition["fs"]:
lvm2 = "yes" uses_lvm2 = True
if partition["mountPoint"] == "/" and "luksMapperName" in partition: if partition["mountPoint"] == "/" and "luksMapperName" in partition:
encrypt_hook = True encrypt_hook = True
@ -183,7 +183,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
): ):
files.append("/crypto_keyfile.bin") files.append("/crypto_keyfile.bin")
if lvm2: if uses_lvm2:
hooks.append("lvm2") hooks.append("lvm2")
if swap_uuid != "": if swap_uuid != "":