Try to fix cmdline

This commit is contained in:
LinuxSquare 2023-07-16 18:15:40 +02:00
parent 0c7bc4b9aa
commit d348e66c11
2 changed files with 4 additions and 11 deletions

View file

@ -12,7 +12,7 @@ system_bootloader_pkgs:
system_bootloader_install: system_bootloader_install:
cmd.run: cmd.run:
- name: "grub-install --target=x86_64-efi --efi-directory=/efi" - name: "grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=alpine-{{ CURRENT_SUBVOLUME_TIMESTAMP }}"
- require: - require:
- system_bootloader_pkgs - system_bootloader_pkgs
@ -68,15 +68,9 @@ system_bootloader_os-release:
- system_bootloader_pkgs - system_bootloader_pkgs
system_bootloader_cmdline: system_bootloader_cmdline:
file.managed: file.append:
- name: /proc/cmdline - name: /etc/default/grub
- source: salt://{{ tpldir }}/files/bootloader_cmdline.jinja - text: 'GRUB_CMDLINE_LINUX_DEFAULT="root="LABEL=ROOT" rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality"'
- template: jinja
- user: root
- group: root
- mode: '0644'
- context:
CURRENT_SUBVOLUME_TIMESTAMP: {{ CURRENT_SUBVOLUME_TIMESTAMP }}
- require: - require:
- system_base_pkgs - system_base_pkgs
- system_bootloader_pkgs - system_bootloader_pkgs

View file

@ -1 +0,0 @@
root="LABEL=ROOT" rootflags=subvol=@root_{{ CURRENT_SUBVOLUME_TIMESTAMP }} lockdown=confidentiality