Merge pull request #1291 from calamares/initcpiocfg-usr

[initcpiocfg] add usr hook if partition is separate
This commit is contained in:
Adriaan de Groot 2020-01-06 14:41:24 +01:00 committed by GitHub
commit dd5adc153f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -155,6 +155,9 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
and "luksMapperName" not in partition): and "luksMapperName" not in partition):
unencrypted_separate_boot = True unencrypted_separate_boot = True
if partition["mountPoint"] == "/usr":
hooks.append("usr")
if encrypt_hook: if encrypt_hook:
hooks.append("encrypt") hooks.append("encrypt")
if not unencrypted_separate_boot and \ if not unencrypted_separate_boot and \