X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=playbooks%2Froles%2Fadjtimex%2Ftemplates%2Fadjtimex.sh;h=6d97e51b2e38b0a45710cfdb45642c8501057578;hb=71c3dac63e78368cc75d5a9f5cd28af3483e3c72;hp=4e39b45953f250e2b1c7de132ad76163df5474a6;hpb=82064c6bbabaa52440214a79f59a619d786a89ba;p=ansible.git

diff --git a/playbooks/roles/adjtimex/templates/adjtimex.sh b/playbooks/roles/adjtimex/templates/adjtimex.sh
index 4e39b45..6d97e51 100755
--- a/playbooks/roles/adjtimex/templates/adjtimex.sh
+++ b/playbooks/roles/adjtimex/templates/adjtimex.sh
@@ -1,8 +1,5 @@
 #! /bin/sh
 
-# Stole some ideas from
-# http://support.ntp.org/bin/view/Support/ManualCalibration
-
 # Warm up DNS
 host -t ns pool.ntp.org
 host pool.ntp.org
@@ -13,22 +10,8 @@ host 2.debian.pool.ntp.org
 host 3.debian.pool.ntp.org
 {% endif %}
 
-{ echo; echo; } | adjtimex -l &&
-ntpdate{% if ansible_facts.os_family == 'Debian' %}-debian{% endif %} &&
-{ echo; echo; } | adjtimex -l &&
-
-hwclock --systohc &&
-{ echo; echo; } | adjtimex -l &&
-hwclock --hctosys &&
-
-{ echo; echo; } | adjtimex -l &&
-adjtimex -r --adjust &&
-{ echo; echo; } | adjtimex -l &&
-
-freq=`adjtimex -p | awk '/frequency:/ {print $2}'` &&
-tick=`adjtimex -p | awk '/tick:/ {print $2}'` &&
-#adjtimex -f "$freq" -t "$tick" &&
+ntpdate{% if ansible_facts.os_family == 'Debian' %}-debian{% endif %} -b &&
+hwclock --systohc --update-drift &&
 
-tail -2 /etc/default/adjtimex &&
-sed -i -e "s/^FREQ=.\+$/FREQ=$freq/" -e "s/^TICK=.\+$/TICK=$tick/" /etc/default/adjtimex &&
-exec tail -2 /etc/default/adjtimex
+hwclock --get &&
+exec date