diff --git a/system/bootloader.sls b/system/bootloader.sls index 9901240..57ba1dd 100644 --- a/system/bootloader.sls +++ b/system/bootloader.sls @@ -25,7 +25,7 @@ system_bootloader_default_grub: file.keyvalue: - name: /etc/default/grub - key_values: - GRUB_CMDLINE_LINUX: '"console=ttyS0,19200n8net.ifnames=0 modules=sd-mod,usb-storage,btrfs rootfstype=btrfs"' + GRUB_CMDLINE_LINUX: '"console=ttyS0,19200n8net.ifnames=0 modules=sd-mod,usb-storage,btrfs rootfstype=btrfs root=LABEL=ROOT rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality"' - separator: '=' - uncomment: '# ' - key_ignore_case: false diff --git a/system/files/bootloader_menuentry b/system/files/bootloader_menuentry index 9860115..d8023b7 100644 --- a/system/files/bootloader_menuentry +++ b/system/files/bootloader_menuentry @@ -6,7 +6,7 @@ menuentry 'Noveria Alpine {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}' --class alpin insmod btrfs search --label --set=root ROOT echo 'Loading Linux lts ...' - linux /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/vmlinuz-lts root=LABEL=ROOT rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality + linux /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/vmlinuz-lts echo 'Loading initial ramdisk ...' initrd /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/initramfs-lts }