From: buildmaster <buildmaster@git.cephalix.eu>
Date: Fri, 11 Feb 2022 10:10:38 +0000 (+0100)
Subject: Fix plugin script to find the right version
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=e3cd6cee21536d5ee6f3a3890aba2529fb4238c1;p=SaltMinion.git

Fix plugin script to find the right version
Reboot the client after installing the new salt version
---

diff --git a/100-update-salt.sh.in b/100-update-salt.sh.in
index d5575d0..da9d342 100644
--- a/100-update-salt.sh.in
+++ b/100-update-salt.sh.in
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Package to update the salt-minion on the clients.
+# Script to update the salt-minion on the clients.
 
 MINION=$1
 
-SALTV=$( salt $MINION grains.get saltversion | tail -n1 )
-
+SALTV=$( salt $MINION grains.get saltversion | tail -n1 | tr -d ' ' )
+echo "$MINION $SALTV"
 if [ "${SALTV}" -a "$SALTV" != "VERSION" ]; then
 	salt $MINION state.apply SaltMinion
 	salt-key -yd $MINION
diff --git a/init.sls.in b/init.sls.in
index 7ad7383..bc1e621 100644
--- a/init.sls.in
+++ b/init.sls.in
@@ -27,6 +27,6 @@ SaltMinion:
       install_flags: '/S /master=admin /minion-name={{ name }}'
       locale: de_DE
       msiexec: False
-      reboot: False
+      reboot: True
       cache_dir: False