Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8803 from neheb/nt

Browse source 
ntpclient: Fix NTP_RUNNING command to work when procps-ng is installed
This commit is contained in:
Rosen Penev 2019-04-25 15:01:15 -07:00 committed by GitHub
commit 947da0fc9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ntpclient/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ntpclient PKG_NAME:=ntpclient
PKG_VERSION:=2015_365 PKG_VERSION:=2015_365
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://doolittle.icarus.com/ntpclient PKG_SOURCE_URL:=http://doolittle.icarus.com/ntpclient

14
net/ntpclient/files/ntpclient.hotplug
View file

@ -9,7 +9,7 @@ unset INTERVAL
unset COUNT unset COUNT
unset INTERFACE_GLOBAL unset INTERFACE_GLOBAL
NTPC=`which ntpclient` NTPC=$(command -v ntpclient)
check_server() { check_server() {
local hostname local hostname
@ -52,12 +52,12 @@ stop_ntpclient() {
load_settings() { load_settings() {
local interval local interval
local count local count
local iface local interface
config_get interval $1 interval config_get interval $1 interval
config_get count $1 count config_get count $1 count
config_get interface $1 interface config_get interface $1 interface
[ -n "$count" ] && COUNT=$count [ -n "$count" ] && COUNT=$count
[ -n "$interval" ] && INTERVAL=$interval [ -n "$interval" ] && INTERVAL=$interval
[ -n "$interface" ] && INTERFACE_GLOBAL=$interface [ -n "$interface" ] && INTERFACE_GLOBAL=$interface
@ -66,13 +66,13 @@ load_settings() {
config_load ntpclient config_load ntpclient
config_foreach load_settings ntpclient config_foreach load_settings ntpclient
NTP_RUNNING=`ps | grep $NTPC | grep -v grep` NTP_RUNNING=$(busybox ps | grep $NTPC | grep -v grep)
case "${ACTION:-ifup}" in case "${ACTION:-ifup}" in
ifup) ifup)
[ -z "$NTP_RUNNING" ] && start_ntpclient [ -z "$NTP_RUNNING" ] && start_ntpclient
;; ;;
ifdown) ifdown)
[ -n "$NTP_RUNNING" ] && stop_ntpclient [ -n "$NTP_RUNNING" ] && stop_ntpclient
;; ;;
esac esac