From: Roy Marples <roy@marples.name>
Date: Thu, 11 Sep 2014 14:30:52 +0000 (+0000)
Subject: Revert [2a977647fe24819f38b64c8ed7257c0bc27c8328] because if the
X-Git-Tag: v6.4.4~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7728093f6f904fe400d0a477f6661e9b0c2d8db0;p=thirdparty%2Fdhcpcd.git

Revert [2a977647fe24819f38b64c8ed7257c0bc27c8328] because if the
services are touched in anyway by an exit hook their status might not
be entirely accurate.
Fixes some issues with parallel service management systems.
---

diff --git a/dhcpcd-hooks/50-ntp.conf b/dhcpcd-hooks/50-ntp.conf
index de377aa4..551c5bef 100644
--- a/dhcpcd-hooks/50-ntp.conf
+++ b/dhcpcd-hooks/50-ntp.conf
@@ -17,7 +17,7 @@ if type invoke-rc.d >/dev/null 2>&1; then
 fi
 
 : ${ntp_service:=ntpd}
-: ${ntp_restart_cmd:=service_condcommand $ntp_service restart &}
+: ${ntp_restart_cmd:=service_condcommand $ntp_service restart}
 ntp_conf_dir="$state_dir/ntp.conf"
 
 # If we have installed OpenNTPD but not NTP then prefer it
diff --git a/dhcpcd-hooks/50-ypbind.in b/dhcpcd-hooks/50-ypbind.in
index a4b5a2da..1421a169 100644
--- a/dhcpcd-hooks/50-ypbind.in
+++ b/dhcpcd-hooks/50-ypbind.in
@@ -1,8 +1,8 @@
 # Sample dhcpcd hook for ypbind
 # This script is only suitable for the BSD versions.
 
-: ${ypbind_restart_cmd:=service_command ypbind restart &}
-: ${ypbind_stop_cmd:=service_condcommand ypbind stop &}
+: ${ypbind_restart_cmd:=service_command ypbind restart}
+: ${ypbind_stop_cmd:=service_condcommand ypbind stop}
 ypbind_dir="$state_dir/ypbind"
 : ${ypdomain_dir:=@YPDOMAIN_DIR@}
 : ${ypdomain_suffix:=@YPDOMAIN_SUFFIX@}