Readd motd, remove os-release

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'