From cc6e5c9d10c350834744a74786b3072ab931f0df Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 22 May 2015 21:57:01 +0200
Subject: [PATCH] ntpd start fix

---
 fs-add/etc/init.d/dhcpc-event |  1 +
 fs-add/etc/init.d/ntpd        | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fs-add/etc/init.d/dhcpc-event b/fs-add/etc/init.d/dhcpc-event
index 5edc213b..2b1aea11 100755
--- a/fs-add/etc/init.d/dhcpc-event
+++ b/fs-add/etc/init.d/dhcpc-event
@@ -30,6 +30,7 @@ renew|bound)
     logger -p local0.notice "DHCP IPv4 changed, killing minisatip"
     rm -f /tmp/satip-network
     killall -9 minisatip 2> /dev/null
+    killall -9 ntpd 2> /dev/null
   fi
   ifconfig $interface $ip $BROADCAST $NETMASK
   if test -n "$router" ; then
diff --git a/fs-add/etc/init.d/ntpd b/fs-add/etc/init.d/ntpd
index acebb86d..99064d4a 100755
--- a/fs-add/etc/init.d/ntpd
+++ b/fs-add/etc/init.d/ntpd
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-test -r /etc/sysconfig/config && . /etc/sysconfig/config
-
-test -z "$NTPD_OPTS" && NTPD_OPTS="-p 0.pool.ntp.org"
-
-exec /usr/sbin/ntpd -I eth0 $NTPD_OPTS
+while test ! -f /tmp/nontpd; do
+  NTPD_OPTS=""
+  test -r /etc/sysconfig/config && . /etc/sysconfig/config
+  test -z "$NTPD_OPTS" && NTPD_OPTS="-p 0.pool.ntp.org"
+  /usr/sbin/ntpd -n -I eth0 $NTPD_OPTS
+done