diff --git a/.checkpackageignore b/.checkpackageignore index 95cb5eccc5..a23cb51c77 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -274,7 +274,6 @@ package/dcron/S90dcron lib_sysv.Variables package/dhcp/S80dhcp-relay Shellcheck lib_sysv.Variables package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace -package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables package/dmalloc/0001-configure-fix-build-on-mips.patch lib_patch.Upstream package/dmalloc/0003-configure-allow-overriding-some-tests.patch lib_patch.Upstream package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch lib_patch.Upstream diff --git a/package/dhcpcd/S41dhcpcd b/package/dhcpcd/S41dhcpcd index 55794f4075..e52e935da2 100644 --- a/package/dhcpcd/S41dhcpcd +++ b/package/dhcpcd/S41dhcpcd @@ -3,31 +3,31 @@ # Start/stop dhcpcd # -DAEMON=/sbin/dhcpcd -CONFIG=/etc/dhcpcd.conf -PIDFILE=/var/run/dhcpcd/pid +DAEMON="dhcpcd" +CONFIG="/etc/dhcpcd.conf" +PIDFILE="/var/run/$DAEMON/pid" [ -f $CONFIG ] || exit 0 case "$1" in - start) - echo "Starting dhcpcd..." - start-stop-daemon -S -x "$DAEMON" -p "$PIDFILE" -- -f "$CONFIG" - ;; - stop) - echo "Stopping dhcpcd..." - start-stop-daemon -K -x "$DAEMON" -p "$PIDFILE" -o - ;; - reload|force-reload) - echo "Reloading dhcpcd configuration..." - "$DAEMON" -s reload - ;; - restart) - "$0" stop - sleep 1 # Prevent race condition: ensure dhcpcd stops before start. - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" - exit 1 + start) + echo "Starting dhcpcd..." + start-stop-daemon -S -x "/sbin/$DAEMON" -p "$PIDFILE" -- -f "$CONFIG" + ;; + stop) + echo "Stopping dhcpcd..." + start-stop-daemon -K -x "/sbin/$DAEMON" -p "$PIDFILE" -o + ;; + reload|force-reload) + echo "Reloading dhcpcd configuration..." + "$DAEMON" -s reload + ;; + restart) + "$0" stop + sleep 1 # Prevent race condition: ensure dhcpcd stops before start. + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload}" + exit 1 esac