X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=playbooks%2Froles%2Fadjtimex%2Ftemplates%2Fadjtimex.sh;h=8721907b97381c5446af6d90fd64025c5cb1dfa2;hb=9e819bff72d8ee2a3186d8ecae647ad1d432b85e;hp=1a4d1c159de52947be957cd07e9d753fe584d788;hpb=3c79c3972a18b73ef16fc2be409f956db302e79f;p=ansible.git

diff --git a/playbooks/roles/adjtimex/templates/adjtimex.sh b/playbooks/roles/adjtimex/templates/adjtimex.sh
index 1a4d1c1..8721907 100755
--- a/playbooks/roles/adjtimex/templates/adjtimex.sh
+++ b/playbooks/roles/adjtimex/templates/adjtimex.sh
@@ -1,15 +1,34 @@
 #! /bin/sh
 
-{ echo; echo; } | adjtimex -h {% if inventory_hostname == 'phdru.name' %}nl{% else %}ru{% endif %}.pool.ntp.org &&
+# 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
+{% if ansible_facts.os_family == 'Debian' %}
+host 0.debian.pool.ntp.org
+host 1.debian.pool.ntp.org
+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 --update-drift &&
+{ 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" &&
 
-sed -i "s/^FREQ=.\+$/FREQ=$freq/" /etc/default/adjtimex &&
-sed -i "s/^TICK=.\+$/TICK=$tick/" /etc/default/adjtimex &&
-
-ntpdate-debian &&
-hwclock --systohc &&
-{ echo; echo; } | adjtimex -h ru.pool.ntp.org
+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