From 459130293c8f0f72bfd4a8bf84058865d175b819 Mon Sep 17 00:00:00 2001
From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com>
Date: Fri, 29 Sep 2023 20:39:30 +0200
Subject: [PATCH] Readd motd, remove os-release

---
 system/base.sls | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/system/base.sls b/system/base.sls
index 2aadeff..ba335d7 100644
--- a/system/base.sls
+++ b/system/base.sls
@@ -26,13 +26,14 @@ system_base_apps_dir:
     - dir_mode: '0755'
     - file_mode: '0644'
 
-system_base_os-release:
+system_base_motd:
   file.managed:
-    - name: /etc/os-release
-    - source: salt://{{ tpldir }}/files/base_os-release.jinja
+    - name: /etc/motd
+    - source: salt://{{ tpldir }}/files/base_motd.jinja
     - template: jinja
     - context:
-        OS_VERSION: {{ salt['cmd.shell']('date "+%Y%m"') }}
+        OS_NAME: {{ salt['cmd.shell']('grep -E ^NAME /etc/os-release | cut -d= -f2 | sed \'s~"~~g\'') }}
+        OS_VERSION: {{ salt['cmd.shell']('grep -E ^VERSION_ID /etc/os-release | cut -d= -f2 | sed \'s~"~~g\'') }}
     - user: root
     - group: root
-    - mode: '0644'
+    - mode: '0644'
\ No newline at end of file