%status and pidfile handling

uucp/rc.uucp

@@ -8,18 +8,24 @@
 
 %common
     uucp_pidfile="@l_prefix@/var/uucp/run/uucpd.pid"
+    uucp_signal () {
+        [ -f $uucp_pidfile ] && kill -$1 `cat $uucp_pidfile`
+    }
     uucp_start () {
         ( @l_prefix@/sbin/uucpd uucp @l_prefix@/sbin/uucico -l \
           </dev/null >/dev/null 2>&1 &
           echo "$!" >$uucp_pidfile
         ) </dev/null >/dev/null 2>&1
     }
-    uucp_stop () {
+
-        if [ -f $uucp_pidfile ]; then
+%status -p 200 -u @l_susr@ -o
-            kill -TERM `cat $uucp_pidfile`
+    uucp_usable="unknown"
-            sleep 1
+    uucp_active="no"
-        fi
+    rcService uucp enable yes && \
-    }
+        uucp_signal 0 && uucp_active="yes"
+    echo "uucp_enable=\"$uucp_enable\""
+    echo "uucp_usable=\"$uucp_usable\""
+    echo "uucp_active=\"$uucp_active\""
 
 %start -p 200 -u @l_susr@
     rcService uucp enable yes || exit 0
@@ -27,10 +33,12 @@
 
 %stop -p 200 -u @l_susr@
     rcService uucp enable yes || exit 0
-    uucp_stop
+    uucp_signal TERM
+    rm -f $uucp_pidfile 2>/dev/null || true
 
 %restart -u @l_susr@
     rcService uucp enable yes || exit 0
-    uucp_stop
+    uucp_signal TERM
+    sleep 2
     uucp_start
 

uucp/uucp.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Communication
 License:      GPL
 Version:      1.07
-Release:      20030719
+Release:      20030721
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/gnu/uucp/uucp-%{version}.tar.gz