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

[initcpiocfg] work on #797 and #796

Browse Source
This commit is contained in:
Philip 2017-09-12 05:07:35 -04:00
parent 402d891aaa
commit 82c0321122
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,12 +114,12 @@ 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"] == "linuxswap": if partition["fs"].lower() == "linuxswap":
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if "luksMapperName" in partition: if "luksMapperName" in partition:
openswap_hook = True openswap_hook = True
if partition["fs"] == "btrfs": if partition["fs"].lower() == "btrfs":
btrfs = "yes" btrfs = "yes"
if partition["mountPoint"] == "/" and "luksMapperName" in partition: if partition["mountPoint"] == "/" and "luksMapperName" in partition: