Merge pull request #8803 from neheb/nt
ntpclient: Fix NTP_RUNNING command to work when procps-ng is installed
This commit is contained in:
commit
947da0fc9f
2 changed files with 8 additions and 8 deletions
|
@ -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
|
||||||
|
|
|
@ -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,7 +52,7 @@ 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
|
||||||
|
@ -66,7 +66,7 @@ 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)
|
||||||
|
|
Loading…
Reference in a new issue