%status and pidfile handling

cups/cups.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Print
 License:      GPL/LGPL with exceptions
 Version:      1.1.19
-Release:      20030719
+Release:      20030721
 
 #   package options
 %option       with_openssl   no

cups/rc.cups

@@ -6,14 +6,33 @@
 %config
     cups_enable="$openpkg_rc_def"
 
+%common
+    cups_pidfile="@l_prefix@/var/cups/cupsd.pid"
+    cups_signal () {
+        [ -f $cups_pidfile ] && kill -$1 `cat $cups_pidfile`
+    }
+
+%status -p 200 -u @l_susr@ -o
+    cups_usable="unknown"
+    cups_active="no"
+    rcService cups enable yes && \
+        cups_signal 0 && cups_active="yes"
+    echo "cups_enable=\"$cups_enable\""
+    echo "cups_usable=\"$cups_usable\""
+    echo "cups_active=\"$cups_active\""
+
 %start -p 200 -u @l_susr@
     rcService cups enable yes || exit 0
     @l_prefix@/libexec/cups/cupsd
 
 %stop -p 200 -u @l_susr@
     rcService cups enable yes || exit 0
-    if [ -f @l_prefix@/var/cups/cupsd.pid ]; then
+    cups_signal TERM
-        kill -TERM `cat @l_prefix@/var/cups/cupsd.pid`
+    rm -f $cups_pidfile 2>/dev/null || true
-        rm -f @l_prefix@/var/cups/cupsd.pid >/dev/null 2>&1 || true
+
-    fi
+%restart -p 200 -u @l_susr@
+    rcService cups enable yes || exit 0
+    rc cups stop
+    sleep 2
+    rc cups start