chrony: Fix install scripts and create 16 chars key.

diff --git a/chrony/chrony-helper b/chrony/chrony-helper
index a5bbf8479c082e5b0078d604786063d926637f56..34add5f40bded6cfee90ac476a99c274dc30de9e 100644 (file)
--- a/chrony/chrony-helper
+++ b/chrony/chrony-helper
@@ -32,7 +32,7 @@ generate_commandkey() {
     commandkey=$(get_key $commandkeyid)
     [ -z "$commandkey" ] || return 0
 
-    commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 8)
+    commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 16)
     [ -n "$commandkey" ] && echo "$commandkeyid $commandkey" >> $keyfile
 }
 

diff --git a/chrony/chrony.nm b/chrony/chrony.nm
index fb44fbb7ea8a79fd4ecc2e3857537afd14363076..3ab23aae313c7e7f3da4d610087472391adba69f 100644 (file)
--- a/chrony/chrony.nm
+++ b/chrony/chrony.nm
@@ -5,7 +5,7 @@
 
 name       = chrony
 version    = 1.26
-release    = 6
+release    = 7
 
 groups     = Base System/Daemons
 url        = http://chrony.tuxfamily.org
@@ -73,31 +73,32 @@ end
 
 packages
        package %{name}
-               preprequires = shadow-utils systemd-units
-       
                configfiles
                        /etc/chrony.conf
                        /etc/chrony.keys
                end
        
+               prerequires = shadow-utils systemd-units
+
                script prein
                        %{create_user}
                end
        
                script postin
-                       /bin/systemctl daemon-reload &>/dev/null
-                       /bin/systemctl enable cronyd.service &>/dev/null
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl --no-reload enable \
+                               chrony-wait.service chronyd.service >/dev/null 2>&1 || :
                end
        
                script preun
                        /bin/systemctl --no-reload disable \
-                               chrony-wait.service chronyd.service &>/dev/null
-                       /bin/systemctl stop chrony-wait.service chronyd.service &>/dev/null
+                               chrony-wait.service chronyd.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop chrony-wait.service chronyd.service >/dev/null 2>&1 || :
                end
        
                script postup
-                       /bin/systemctl daemon-reload &>/dev/null
-                       /bin/systemctl try-restart chronyd.service &>/dev/null
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart chronyd.service >/dev/null 2>&1 || :
                end
        end
 end