From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 4 Aug 2013 12:40:24 +0000 (+0000)
Subject: busybox: rename ntp init script back to sysntpd (#13920)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c5b4d98d3956d623980d962cfab07e0c48e2ca5a;p=openwrt%2Fstaging%2Fthess.git

busybox: rename ntp init script back to sysntpd (#13920)

Renaming the init script to ntp broke LuCI time sync functionality and collides with other ntp packages

SVN-Revision: 37681
---

diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 0b2778ffd9..15f96ebb3c 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -37,7 +37,7 @@ endif
 
 init-y :=
 init-$(CONFIG_BUSYBOX_CONFIG_CROND) += cron
-init-$(CONFIG_BUSYBOX_CONFIG_NTPD) += ntp
+init-$(CONFIG_BUSYBOX_CONFIG_NTPD) += sysntpd
 init-$(CONFIG_BUSYBOX_CONFIG_TELNETD) += telnet
 
 define Package/busybox
diff --git a/package/utils/busybox/files/ntp b/package/utils/busybox/files/ntp
deleted file mode 100755
index c40ee76da3..0000000000
--- a/package/utils/busybox/files/ntp
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2011 OpenWrt.org
-
-START=98
-
-USE_PROCD=1
-PROG=/usr/sbin/ntpd
-SERVICE_PID_FILE=/var/run/sysntpd.pid
-
-start_service() {
-	local peers
-	local args="-n"
-	local enable_server
-
-	config_load system
-	config_get peers ntp server
-	config_get_bool enable_server ntp enable_server 0
-
-	[ $enable_server -eq 0 -a -z "$peers" ] && return
-
-	procd_open_instance
-	procd_set_param command "$PROG" -n
-        [ $enable_server -ne 0 ] && procd_append_param command -l
-	[ -n "$peers" ] && {
-		local peer
-		for peer in $peers; do
-			procd_append_param command -p $peer
-		done
-	}
-	procd_close_instance
-}
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
new file mode 100755
index 0000000000..c40ee76da3
--- /dev/null
+++ b/package/utils/busybox/files/sysntpd
@@ -0,0 +1,31 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2011 OpenWrt.org
+
+START=98
+
+USE_PROCD=1
+PROG=/usr/sbin/ntpd
+SERVICE_PID_FILE=/var/run/sysntpd.pid
+
+start_service() {
+	local peers
+	local args="-n"
+	local enable_server
+
+	config_load system
+	config_get peers ntp server
+	config_get_bool enable_server ntp enable_server 0
+
+	[ $enable_server -eq 0 -a -z "$peers" ] && return
+
+	procd_open_instance
+	procd_set_param command "$PROG" -n
+        [ $enable_server -ne 0 ] && procd_append_param command -l
+	[ -n "$peers" ] && {
+		local peer
+		for peer in $peers; do
+			procd_append_param command -p $peer
+		done
+	}
+	procd_close_instance
+}