Merge branch 'issue-1773' into calamares

FIXES #1773
This commit is contained in:
Adriaan de Groot 2021-09-06 10:51:38 +02:00
commit c24b2b1a8b

View File

@ -133,6 +133,12 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker
"root=/dev/mapper/"
+ partition["luksMapperName"]]
# systemd-boot with a BTRFS root filesystem needs to be told
# about the root subvolume.
for partition in partitions:
if partition["mountPoint"] == "/" and partition["fs"] == "btrfs":
kernel_params.append("rootflags=subvol=@")
if cryptdevice_params:
kernel_params.extend(cryptdevice_params)
else: