Attachment 248391 Details for Bug 277003 – Unified diff for more robust RC script

[patch] Unified diff for more robust RC script

patch (text/plain), 1.36 KB, created by Jason W. Bacon on 2024-02-12 14:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason W. Bacon

Created: 2024-02-12 14:00:01 UTC

Size: 1.36 KB

patch

obsolete

>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/security/munge/files/munged.in /usr/ports/wip/munge/files/munged.in
>--- /usr/ports/security/munge/files/munged.in   2022-11-03 09:15:01.627943000 -0500
>+++ /usr/ports/wip/munge/files/munged.in        2024-02-12 07:54:19.875467000 -0600
>@@ -7,7 +7,7 @@
> # Add the following line to /etc/rc.conf to enable munged:
> # munged_enable (bool): Set to "NO" by default.
> #                       Set it to "YES" to enable munged.
>-# munged_keyfile (str): Set to "/usr/local/etc/munge/munge.key" by default.
>+# munged_keyfile (str): Set to "%%PREFIX%%/etc/munge/munge.key" by default.
> #                       Custom munge key.
> # munged_pidfile (str): Set to "/var/run/munged.pid" by default.
> #                       Custom PID file path and name.
>@@ -31,10 +31,23 @@
> 
> munged_stop()
> {
>-       if [ -f "${pidfile}" ]; then
>-               kill `cat ${pidfile}`
>-       fi
>+    echo "Stopping $name."
>+    registered_pid=$(cat $pidfile)
> 
>+    pids="$registered_pid $(pgrep -d ' ' $name)"
>+    if [ -n "$pids" ]; then
>+        echo "Waiting for PIDs: $pids"
>+        for signal in TERM INT QUIT KILL
>+        do
>+            kill -s $signal $pids
>+            sleep 1
>+            pids=$(pgrep -d ' ' $name)
>+            if [ -z "$pids" ]; then
>+                break
>+            fi
>+        done
>+    fi
>+    rm -f $pidfile
> }
> 
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 277003: 248391 | 248392 | 248413 | 248481