daemon: make --makepid work with rc-logging

need a wrapper to achieve this

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 22d17fb5c76e4071f9ea382affb03b07052f32ae..0921a76b7243bb87f513b081ffe005dde8926b9d 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,6 @@ sbin_SCRIPTS = \
        tnldown \
        tnlup
 
-#scriptsdir = @networkscriptsdir@
 scriptsdir = @exec_prefix@/lib/$(PACKAGE)
 
 scripts_SCRIPTS = \
@@ -28,7 +27,8 @@ scripts_SCRIPTS = \
        ifup-ppp \
        ifup-routes \
        ifup-sl \
-       ifup-vlan
+       ifup-vlan \
+       makepid \
 
 scripts_DATA = \
        functions \

diff --git a/lib/functions b/lib/functions
index 6ded51470f77b561bc81aa26f07f05cc4649afe9..ca08dbe100799640aad0be6e9d2cd953e381fc60 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -690,6 +690,11 @@ _daemon_exec() {
                        --exec "$prog" \
                        -- "$@"
        else
+               if [ "$makepid" ] && [ "$pidfile" ]; then
+                       export PIDFILE="$pidfile"
+                       set -- /lib/rc-scripts/makepid "$@"
+               fi
+
                if [ "$fork" = "1" ]; then
                        set -- /usr/bin/setsid "$@"
                fi

diff --git a/lib/makepid b/lib/makepid
new file mode 100755 (executable)
index 0000000..224b431
--- /dev/null
+++ b/lib/makepid
@@ -0,0 +1,12 @@
+#!/bin/sh
+test -n "$PIDFILE" || { echo >&2 'Missing $PIDFILE env'; exit 1; }
+
+# run the program, and capture pid
+prog="$1"; shift
+"$prog" "$@" &
+pid=$!
+rc=$?
+
+# write pid to file
+echo "$pid" > "$PIDFILE"
+exit $rc