diff --git a/system/bootloader.sls b/system/bootloader.sls index 7f66568..76a85b8 100644 --- a/system/bootloader.sls +++ b/system/bootloader.sls @@ -13,37 +13,6 @@ system_bootloader_pkgs: {% set CURRENT_SUBVOLUME_TIMESTAMP = salt['cmd.shell']('CURRENT_SUBVOLUME=$(LC_ALL=C btrfs sub show / | LC_ALL=C grep Name: | tr -d \'[:space:]\'); TIMESTAMP_FORMAT=\'[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}_[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}\'; echo "$CURRENT_SUBVOLUME" | grep -Eo "$TIMESTAMP_FORMAT"') %} {% set CURRENT_SUBVOLUME_TIMESTAMP_HUMAN = salt['cmd.shell']('CURRENT_SUBVOLUME_TIMESTAMP=\'' + CURRENT_SUBVOLUME_TIMESTAMP + '\'; echo "${CURRENT_SUBVOLUME_TIMESTAMP:0:10} ${CURRENT_SUBVOLUME_TIMESTAMP:11:2}:${CURRENT_SUBVOLUME_TIMESTAMP:14:2}"') %} {% set KERNEL_VERSION = salt['cmd.shell']('uname -r') %} -{% set ROOT_UUID = salt['cmd.shell']('lsblk -o LABEL,UUID | grep ROOT | awk \'{print $2}\'') %} - -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 - - key_values: - GRUB_CMDLINE_LINUX: '"console=ttyS0,19200n8net.ifnames=0"' - - 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 - - makedirs: true - - user: root - - group: root - - mode: '0755' - - require: - - system_bootloader_install system_bootloader_mkinitfs_conf: file.keyvalue: @@ -68,40 +37,3 @@ system_bootloader_os-release: - uncomment: '# ' - key_ignore_case: False - append_if_not_found: True - -system_bootloader_remove_default_menuentry: - file.absent: - - name: /etc/grub.d/10_linux - - require: - - system_bootloader_install - -system_bootloader_menuentry: - file.managed: - - name: /etc/grub.d/10_noveria - - source: salt://{{ tpldir }}/files/bootloader_menuentry - - template: jinja - - context: - CURRENT_SUBVOLUME_TIMESTAMP_HUMAN: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }} - CURRENT_SUBVOLUME_TIMESTAMP: {{ CURRENT_SUBVOLUME_TIMESTAMP }} - ROOT_UUID: {{ ROOT_UUID }} - - mode: '0755' - - require: - - system_base_pkgs - - system_bootloader_pkgs - - system_bootloader_remove_default_menuentry - -system_bootloader_menuentry_prepend_shebang: - file.prepend: - - name: /etc/grub.d/10_noveria - - text: "#!/bin/sh" - - require: - - system_bootloader_menuentry - -system_bootloader_config: - cmd.run: - - name: 'grub-mkconfig -o /boot/grub/grub.cfg' - - require: - - system_bootloader_pkgs - - system_bootloader_install - - system_bootloader_grub_dir - - system_bootloader_menuentry_prepend_shebang diff --git a/system/files/bootloader_menuentry b/system/files/bootloader_menuentry deleted file mode 100644 index ba85da1..0000000 --- a/system/files/bootloader_menuentry +++ /dev/null @@ -1,13 +0,0 @@ -cat <