Fix os-release

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'

system/bootloader.sls

@@ -28,12 +28,14 @@ system_bootloader_mkinitfs_conf:
       - system_base_pkgs
       - system_bootloader_pkgs
 
-system_bootloader_os-release:
+system_base_os-release:
-  file.keyvalue:
+  file.managed:
     - name: /etc/os-release
-    - key_values:
+    - source: salt://{{ tpldir }}/files/base_os-release.jinja
-        RELEASE_INFO: '"Timestamp: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }} | Kernel: {{ KERNEL_VERSION }}"'
+    - template: jinja
-    - separator: '='
+    - context:
-    - uncomment: '# '
+        OS_VERSION: {{ salt['cmd.shell']('date "+%Y%m"') }}
-    - key_ignore_case: False
+        OS_RELEASE_INFO: '"Timestamp: {{ CURRENT_SUBVOLUME_TIMESTAMP_HUMAN }} | Kernel: {{ KERNEL_VERSION }}"'
-    - append_if_not_found: True
+    - user: root
+    - group: root
+    - mode: '0644'

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"