diff --git a/system/bootloader.sls b/system/bootloader.sls index 1d34773..55ae537 100644 --- a/system/bootloader.sls +++ b/system/bootloader.sls @@ -18,8 +18,21 @@ system_bootloader_install: cmd.run: - name: "grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=alpine-{{ CURRENT_SUBVOLUME_TIMESTAMP }}" - require: + - system_base_pkgs - system_bootloader_pkgs +system_bootloader_default_grub: + file.keyvalue: + - name: /etc/default/grub + GRUB_CMDLINE_LINUX: '"console=ttyS0,19200n8net.ifnames=0 modules=sd-mod,usb-storage,btrfs rootfstype=btrfs"' + - separator: '=' + - uncomment: '# ' + - key_ignore_case: false + - value_ignore_case: false + - append_if_not_found: true + - require: + - system_bootloader_install + system_bootloader_grub_dir: file.directory: - name: /boot/grub @@ -28,14 +41,13 @@ system_bootloader_grub_dir: - group: root - mode: '0755' - require: - - system_bootloader_pkgs - system_bootloader_install system_bootloader_mkinitfs_conf: file.keyvalue: - name: /etc/mkinitfs/mkinitfs.conf - key_values: - features: '"ata base btrfs keymap kms mmc nvme scsi usb virtio rootfstype=btrfs"' + features: '"ata base btrfs keymap kms mmc nvme scsi usb virtio"' - separator: '=' - uncomment: '# ' - key_ignore_case: false