From 0eb57aea9df0b0ff5fe51be1f376c0eaf8531f41 Mon Sep 17 00:00:00 2001 From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com> Date: Tue, 18 Jul 2023 20:38:02 +0200 Subject: [PATCH] try to fix grub 6 --- system/bootloader.sls | 2 +- system/files/bootloader_menuentry | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/bootloader.sls b/system/bootloader.sls index 7cbfffe..1d34773 100644 --- a/system/bootloader.sls +++ b/system/bootloader.sls @@ -35,7 +35,7 @@ system_bootloader_mkinitfs_conf: file.keyvalue: - name: /etc/mkinitfs/mkinitfs.conf - key_values: - features: '"ata base cdrom ext4 btrfs keymap kms mmc nvme raid scsi usb virtio"' + features: '"ata base btrfs keymap kms mmc nvme scsi usb virtio rootfstype=btrfs"' - separator: '=' - uncomment: '# ' - key_ignore_case: false diff --git a/system/files/bootloader_menuentry b/system/files/bootloader_menuentry index 0756311..9860115 100644 --- a/system/files/bootloader_menuentry +++ b/system/files/bootloader_menuentry @@ -4,8 +4,8 @@ menuentry 'Noveria Alpine {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }}' --class alpin insmod gzio insmod part_gpt insmod btrfs - search --nofloppy --label --set=root ROOT - echo 'Loading Linuzx lts ...' + 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 echo 'Loading initial ramdisk ...' initrd /@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }}/boot/initramfs-lts