b89394cb62
Restarting dnsmasq can cause constant issues: stop works, but start
fails because the new instance can't bind the socket. Another restart
immediately after works just fine:
# /etc/init.d/S80dnsmasq restart
Stopping dnsmasq: OK
Starting dnsmasq:
dnsmasq: failed to create listening socket for 192.168.128.1: Address in use
FAIL
# /etc/init.d/S80dnsmasq restart
Stopping dnsmasq: FAIL
Starting dnsmasq: OK
Solve this by waiting for process to actually stop before returning
from the stop command. Clean up the PID file after to avoid potential
issues with the PID being reused after stop. The wait could also be
placed inside the restart block, but putting it into the stop block
has the advantage that it also avoids similar issues for any other
callers.
Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>
[yann.morin.1998@free.fr:
- fix shellcheck
- reflow commit log
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 507caef3dd)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
39 lines
803 B
Bash
39 lines
803 B
Bash
#!/bin/sh
|
|
|
|
DAEMON="dnsmasq"
|
|
PIDFILE="/var/run/$DAEMON.pid"
|
|
|
|
[ -f /etc/dnsmasq.conf ] || exit 0
|
|
|
|
case "$1" in
|
|
start)
|
|
printf "Starting dnsmasq: "
|
|
start-stop-daemon -S -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- \
|
|
--pid-file="$PIDFILE"
|
|
# shellcheck disable=SC2181
|
|
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
|
;;
|
|
stop)
|
|
printf "Stopping dnsmasq: "
|
|
start-stop-daemon -K -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON"
|
|
# shellcheck disable=SC2181
|
|
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
|
# wait for dnsmasq process to be gone
|
|
while true; do
|
|
pid="$( cat "${PIDFILE}" 2>/dev/null || true )"
|
|
{ [ -n "${pid}" ] && [ -d "/proc/${pid}" ]; } || break
|
|
sleep 0.1
|
|
done
|
|
rm -f "$PIDFILE"
|
|
;;
|
|
restart|reload)
|
|
$0 stop
|
|
$0 start
|
|
;;
|
|
*)
|
|
echo "Usage: $0 {start|stop|restart}"
|
|
exit 1
|
|
esac
|
|
|
|
exit 0
|