fix daemon --fork uses, patch from pld-rc-scripts mailinglist

diff --git a/rc-scripts-git.patch b/rc-scripts-git.patch
index 4cab90a9bbe6e8988fa6003c31309a223c171784..4b9a2f3be9ebd9b78ebe8250427859b9daef2c88 100644 (file)
--- a/rc-scripts-git.patch
+++ b/rc-scripts-git.patch
@@ -1,8 +1,27 @@
 diff --git a/lib/functions b/lib/functions
-index 8d018f7..501cac9 100644
+index 8d018f7..f9538d2 100644
 --- a/lib/functions
 +++ b/lib/functions
-@@ -1009,7 +1009,7 @@ pidofproc() {
+@@ -690,13 +690,12 @@ _daemon_exec() {
+                       --exec "$prog" \
+                       -- "$@"
+       else
+-
+-              if [ "$makepid" ] && [ "$pidfile" ]; then
+-                      export PIDFILE="$pidfile"
+-                      set -- /lib/rc-scripts/makepid "$@"
+-              fi
+-
+               if [ "$fork" = "1" ]; then
++                      export PIDFILE="/dev/null"
++                      if [ "$makepid" ] && [ "$pidfile" ]; then
++                              export PIDFILE="$pidfile"
++                      fi
++                      set -- /lib/rc-scripts/makepid "$@"
+                       set -- /usr/bin/setsid "$@"
+               fi
+               if [ -n "$user" -a "$user" != "root" ]; then
+@@ -1009,7 +1008,7 @@ pidofproc() {
        fi
  
        # Next try "pidof" if pidfile is not specified

diff --git a/rc-scripts.spec b/rc-scripts.spec
index e45888a3801d997a4cb597f6be1f8bc5a2eb6a26..4aac10ab22c51eb41226ad112356948425c8bac3 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.15
-Release:       2
+Release:       3
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz