KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

busybox: use ntp enabled config option

Browse source 
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
This commit is contained in:
John Crispin 2014-06-27 07:55:03 +00:00
parent 818e38625f
commit a51588a5f9
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/utils/busybox/Makefile
View file

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox PKG_NAME:=busybox
PKG_VERSION:=1.22.1 PKG_VERSION:=1.22.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_FLAGS:=essential PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

6
package/utils/busybox/files/sysntpd
View file

@ -8,17 +8,19 @@ PROG=/usr/sbin/ntpd
validate_ntp_section() { validate_ntp_section() {
uci_validate_section system timeserver "${1}" \ 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() { start_service() {
local server enable_server peer local server enabled enable_server peer
validate_ntp_section ntp || { validate_ntp_section ntp || {
echo "validation failed" echo "validation failed"
return 1 return 1
} }
[ $enabled = 0 ] && return
[ -z "$server" ] && return [ -z "$server" ] && return
procd_open_instance procd_open_instance