From 5e1c9b626fead7c3ea6a15dac38f3dee7943c6df Mon Sep 17 00:00:00 2001 From: zavaruev Date: Mon, 10 Aug 2026 12:04:49 +0300 Subject: [PATCH 1/2] majestic: make S95majestic watchdog-friendly (no pidfile, match by exec path) --- general/package/majestic/files/S95majestic | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/general/package/majestic/files/S95majestic b/general/package/majestic/files/S95majestic index bef48e2c41..95cd0c475e 100755 --- a/general/package/majestic/files/S95majestic +++ b/general/package/majestic/files/S95majestic @@ -1,24 +1,22 @@ #!/bin/sh -DAEMON="majestic" -PIDFILE="/var/run/$DAEMON.pid" +DAEMON="/usr/bin/majestic" DAEMON_ARGS="-s" start() { echo -n "Starting $DAEMON: " - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS + start-stop-daemon -b -S -q -x "$DAEMON" -- $DAEMON_ARGS if [ $? -eq 0 ]; then echo "OK" else - echo "FAIL" + echo "FAIL (already running)" fi } stop() { echo -n "Stopping $DAEMON: " - start-stop-daemon -K -q -p "$PIDFILE" + start-stop-daemon -K -q -x "$DAEMON" if [ $? -eq 0 ]; then - rm -f "$PIDFILE" echo "OK" else echo "FAIL" From 8b19ed12a37611390d953e776ae84d23b4300196 Mon Sep 17 00:00:00 2001 From: zavaruev Date: Mon, 10 Aug 2026 18:39:21 +0300 Subject: [PATCH 2/2] majestic: fix reload signal and start status for watchdog-friendly init --- general/package/majestic/files/S95majestic | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/general/package/majestic/files/S95majestic b/general/package/majestic/files/S95majestic index 95cd0c475e..b8aef8ddf6 100755 --- a/general/package/majestic/files/S95majestic +++ b/general/package/majestic/files/S95majestic @@ -6,23 +6,26 @@ DAEMON_ARGS="-s" start() { echo -n "Starting $DAEMON: " start-stop-daemon -b -S -q -x "$DAEMON" -- $DAEMON_ARGS - if [ $? -eq 0 ]; then - echo "OK" - else - echo "FAIL (already running)" - fi + case $? in + 0) echo "OK" ;; + 1) echo "FAIL (already running)" ;; + *) echo "FAIL" ;; + esac } stop() { echo -n "Stopping $DAEMON: " - start-stop-daemon -K -q -x "$DAEMON" - if [ $? -eq 0 ]; then + if start-stop-daemon -K -q -x "$DAEMON"; then echo "OK" else echo "FAIL" fi } +reload() { + start-stop-daemon -K -s 1 -q -x "$DAEMON" +} + case "$1" in start|stop) $1 @@ -35,7 +38,7 @@ case "$1" in ;; reload) - killall -1 "$DAEMON" + reload ;; *)