From 2fcc7135cc617af9b3baf0da22290ebec63ed899 Mon Sep 17 00:00:00 2001
From: Andy Boyett <agb@openwrt.org>
Date: Tue, 22 Apr 2008 23:33:19 +0000
Subject: [PATCH] [packages] ntpd  -Split ntpdate off of ntpd's init-script,
 ntpd works properly without it  -Make ntpd start just after ntpdate (if both
 are installed)  -UCI config for ntpdate may be added, but ntpdate will be
 retired upstream in the future

SVN-Revision: 10920
---
 net/ntpd/Makefile           |  2 +-
 net/ntpd/files/ntpd.init    |  9 ++-------
 net/ntpd/files/ntpdate.init | 13 +++++++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 net/ntpd/files/ntpdate.init

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index 910d12f5d8..3d155bafae 100644
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
 PKG_VERSION:=4.2.4p4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
diff --git a/net/ntpd/files/ntpd.init b/net/ntpd/files/ntpd.init
index c966aab63c..d287226cc0 100644
--- a/net/ntpd/files/ntpd.init
+++ b/net/ntpd/files/ntpd.init
@@ -1,19 +1,14 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 
-START=60
+START=65
 
-STEP_SERVERS="0.openwrt.pool.ntp.org 1.openwrt.pool.ntp.org 2.openwrt.pool.ntp.org"
 PIDFILE="/var/run/ntpd.pid"
-TIMEOUT="2" # in seconds
 
 start() {
 #	ln -sf /dev/ttyS0 /dev/gps0
 #	/usr/sbin/setgarmin -d /dev/gps -c /etc/setgarmin.conf
 	stop
-	for s in $STEP_SERVERS ; do
-		/usr/sbin/ntpdate -s -b -u -t "$TIMEOUT" "$s" && break
-	done
 	/usr/sbin/ntpd -g -p $PIDFILE
 }
 
diff --git a/net/ntpd/files/ntpdate.init b/net/ntpd/files/ntpdate.init
new file mode 100644
index 0000000000..2f332104d2
--- /dev/null
+++ b/net/ntpd/files/ntpdate.init
@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2008 OpenWrt.org
+
+START=60
+
+STEP_SERVERS="0.openwrt.pool.ntp.org 1.openwrt.pool.ntp.org 2.openwrt.pool.ntp.org"
+TIMEOUT="2" # in seconds
+
+start() {
+	for s in $STEP_SERVERS ; do
+		/usr/sbin/ntpdate -s -b -u -t "$TIMEOUT" "$s" && break
+	done
+}
-- 
2.30.2