diff options
| author | Ondřej Caletka <ondrej@caletka.cz> | 2014-11-30 18:47:58 +0100 |
|---|---|---|
| committer | Ondřej Caletka <ondrej@caletka.cz> | 2014-12-01 15:15:35 +0100 |
| commit | 4f7b0213d9d75391cc34636a2bcf302164aa410f (patch) | |
| tree | 36fc56f9002d80c4472ef8cbed8ae067fb716f48 /ipv6 | |
| parent | f6242bdf77b5258d607899a67f6558c73fe47399 (diff) | |
aiccu: add NTP sync check
This check tries to wait for NTP daemon to synchronise clock to lower stratum
than 16 before running the aiccu binary. In case timeout (configurable
in new option ntpsynctimeout; default is 90 seconds) is reached, the
AICCU is run neverrtheless. This makes the new script compliant with
some corner case scenarios like not using Busybox NTPd or not using NTPd
at all, maintaining maximum out-of-the box functionality.
Signed-off-by: Ondrej Caletka <Ondrej@Caletka.cz>
Diffstat (limited to 'ipv6')
| -rwxr-xr-x | ipv6/aiccu/files/aiccu.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ipv6/aiccu/files/aiccu.sh b/ipv6/aiccu/files/aiccu.sh index f38a75c74..89c812219 100755 --- a/ipv6/aiccu/files/aiccu.sh +++ b/ipv6/aiccu/files/aiccu.sh @@ -14,8 +14,8 @@ proto_aiccu_setup() { local iface="$2" local link="aiccu-$cfg" - local username password protocol server ip6prefix tunnelid requiretls defaultroute nat heartbeat verbose sourcerouting ip6addr - json_get_vars username password protocol server ip6prefix tunnelid requiretls defaultroute nat heartbeat verbose sourcerouting ip6addr + local username password protocol server ip6prefix tunnelid requiretls defaultroute nat heartbeat verbose sourcerouting ip6addr ntpsynctimeout + json_get_vars username password protocol server ip6prefix tunnelid requiretls defaultroute nat heartbeat verbose sourcerouting ip6addr ntpsynctimeout [ -z "$username" -o -z "$password" ] && { proto_notify_error "$cfg" "MISSING_USERNAME_OR_PASSWORD" @@ -27,6 +27,7 @@ proto_aiccu_setup() { CFGFILE="/var/etc/${link}.conf" PIDFILE="/var/run/${link}.pid" + NTPSTRATUMFILE="/var/run/aiccu_ntp_stratum" mkdir -p /var/run /var/etc echo "username $username" > "$CFGFILE" @@ -43,6 +44,15 @@ proto_aiccu_setup() { echo "daemonize true" >> "$CFGFILE" echo "pidfile $PIDFILE" >> "$CFGFILE" + # By default, wait at most 90 seconds for NTP sync + [ -z "$ntpsynctimeout" ] && ntpsynctimeout=90 + for i in $(seq 1 $ntpsynctimeout); do + [ -f "$NTPSTRATUMFILE" ] && \ + [ "$(cat $NTPSTRATUMFILE)" -lt 16 ] && \ + echo "NTP synced, stratum $(cat $NTPSTRATUMFILE)" && break + [ "$(( $i % 10 ))" -eq 0 ] && echo "Waiting ${i} secs for NTP sync..." + sleep 1 + done aiccu start "$CFGFILE" @@ -99,6 +109,7 @@ proto_aiccu_init_config() { proto_config_add_boolean "nat" proto_config_add_boolean "heartbeat" proto_config_add_boolean "verbose" + proto_config_add_int "ntpsynctimeout" } [ -n "$INCLUDE_ONLY" ] || { |