diff --git a/system/base.sls b/system/base.sls index b8f50fa..c4e1dae 100644 --- a/system/base.sls +++ b/system/base.sls @@ -26,14 +26,3 @@ system_base_apps_dir: - group: root - dir_mode: '0755' - file_mode: '0644' - -system_base_os-release: - file.managed: - - name: /etc/os-release - - source: salt://{{ tpldir }}/files/base_os-release.jinja - - template: jinja - - context: - OS_VERSION: {{ salt['cmd.shell']('date "+%Y%m"') }} - - user: root - - group: root - - mode: '0644' \ No newline at end of file diff --git a/system/bootloader.sls b/system/bootloader.sls index b0168ea..3eb3bb2 100644 --- a/system/bootloader.sls +++ b/system/bootloader.sls @@ -28,12 +28,14 @@ system_bootloader_mkinitfs_conf: - system_base_pkgs - system_bootloader_pkgs -system_bootloader_os-release: - file.keyvalue: +system_base_os-release: + file.managed: - name: /etc/os-release - - key_values: - RELEASE_INFO: '"Timestamp: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }} | Kernel: {{ KERNEL_VERSION }}"' - - separator: '=' - - uncomment: '# ' - - key_ignore_case: False - - append_if_not_found: True + - source: salt://{{ tpldir }}/files/base_os-release.jinja + - template: jinja + - context: + OS_VERSION: {{ salt['cmd.shell']('date "+%Y%m"') }} + OS_RELEASE_INFO: '"Timestamp: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }} | Kernel: {{ KERNEL_VERSION }}"' + - user: root + - group: root + - mode: '0644' diff --git a/system/files/base_os-release.jinja b/system/files/bootloader_os-release.jinja similarity index 84% rename from system/files/base_os-release.jinja rename to system/files/bootloader_os-release.jinja index c35c652..a31a2f9 100644 --- a/system/files/base_os-release.jinja +++ b/system/files/bootloader_os-release.jinja @@ -3,5 +3,6 @@ ID=noveriaos ID_LIKE=alpine VERSION_ID="{{ OS_VERSION }}" PRETTY_NAME="NoveriaOS {{ OS_VERSION }}" +RELEASE_INFO="{{ OS_RELEASE_INFO }}" HOME_URL="https://noveria.org" BUG_REPORT_URL="https://git.noveria.org/NoveriaOS/iso/issues"