mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 14:01:57 -09:00
package/busybox: tidy up klogd init script
* Wait for process to stop before deleting PID file, instead of fixed
wait during restart
* Use long form options
Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit b91258e424)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
committed by
Thomas Perale
parent
55a3240a9e
commit
def51e9746
@@ -13,7 +13,8 @@ KLOGD_ARGS=""
|
|||||||
start() {
|
start() {
|
||||||
printf 'Starting %s: ' "$DAEMON"
|
printf 'Starting %s: ' "$DAEMON"
|
||||||
# shellcheck disable=SC2086 # we need the word splitting
|
# shellcheck disable=SC2086 # we need the word splitting
|
||||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
|
start-stop-daemon --start --background --make-pidfile \
|
||||||
|
--pidfile "$PIDFILE" --exec "/sbin/$DAEMON" \
|
||||||
-- -n $KLOGD_ARGS
|
-- -n $KLOGD_ARGS
|
||||||
status=$?
|
status=$?
|
||||||
if [ "$status" -eq 0 ]; then
|
if [ "$status" -eq 0 ]; then
|
||||||
@@ -26,20 +27,24 @@ start() {
|
|||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
printf 'Stopping %s: ' "$DAEMON"
|
printf 'Stopping %s: ' "$DAEMON"
|
||||||
start-stop-daemon -K -q -p "$PIDFILE"
|
start-stop-daemon --stop --pidfile "$PIDFILE" --exec "/sbin/$DAEMON"
|
||||||
status=$?
|
status=$?
|
||||||
if [ "$status" -eq 0 ]; then
|
if [ "$status" -eq 0 ]; then
|
||||||
rm -f "$PIDFILE"
|
|
||||||
echo "OK"
|
echo "OK"
|
||||||
else
|
else
|
||||||
echo "FAIL"
|
echo "FAIL"
|
||||||
|
return "$status"
|
||||||
fi
|
fi
|
||||||
|
while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \
|
||||||
|
--exec "/sbin/$DAEMON"; do
|
||||||
|
sleep 0.1
|
||||||
|
done
|
||||||
|
rm -f "$PIDFILE"
|
||||||
return "$status"
|
return "$status"
|
||||||
}
|
}
|
||||||
|
|
||||||
restart() {
|
restart() {
|
||||||
stop
|
stop
|
||||||
sleep 1
|
|
||||||
start
|
start
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user