From a51588a5f9a5c62206b467def65a13219f2fe0ad Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Fri, 27 Jun 2014 07:55:03 +0000
Subject: [PATCH] busybox: use ntp enabled config option
Even if enabled option is missing from ntp configuration we are still keeping
default behavior.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 41355
---
package/utils/busybox/Makefile | 4 ++--
package/utils/busybox/files/sysntpd | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 6dbd54d746..143ad46b53 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
PKG_VERSION:=1.22.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
index c5c3c8e59a..417addfb1c 100755
--- a/package/utils/busybox/files/sysntpd
+++ b/package/utils/busybox/files/sysntpd
@@ -8,17 +8,19 @@ PROG=/usr/sbin/ntpd
validate_ntp_section() {
uci_validate_section system timeserver "${1}" \
- 'server:list(host)' 'enable_server:bool:0'
+ 'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0'
}
start_service() {
- local server enable_server peer
+ local server enabled enable_server peer
validate_ntp_section ntp || {
echo "validation failed"
return 1
}
+ [ $enabled = 0 ] && return
+
[ -z "$server" ] && return
procd_open_instance
--
GitLab