Blame xtide-2.12.1-rcscript-pidfile.patch
|
TASAKA Mamoru |
05f4829 |
--- xtide-2.12.1/scripts/Fedora/rc.xttpd.pid 2006-11-25 07:03:03.000000000 +0900
|
|
TASAKA Mamoru |
05f4829 |
+++ xtide-2.12.1/scripts/Fedora/rc.xttpd 2012-03-05 10:41:04.283973613 +0900
|
|
TASAKA Mamoru |
05f4829 |
@@ -13,6 +13,7 @@
|
|
TASAKA Mamoru |
05f4829 |
CONFIG=/etc/sysconfig/xttpd
|
|
TASAKA Mamoru |
05f4829 |
|
|
TASAKA Mamoru |
05f4829 |
LOCK=/var/lock/subsys/xttpd
|
|
TASAKA Mamoru |
05f4829 |
+PIDFILE=/var/run/xttpd.pid
|
|
TASAKA Mamoru |
05f4829 |
|
|
TASAKA Mamoru |
05f4829 |
# Source function library.
|
|
TASAKA Mamoru |
05f4829 |
. /etc/rc.d/init.d/functions
|
|
TASAKA Mamoru |
05f4829 |
@@ -39,15 +40,23 @@
|
|
TASAKA Mamoru |
05f4829 |
RETVAL=1
|
|
TASAKA Mamoru |
05f4829 |
return $RETVAL
|
|
TASAKA Mamoru |
05f4829 |
fi
|
|
TASAKA Mamoru |
05f4829 |
+ if pgrep -U xttpd -f $PROG ; then
|
|
TASAKA Mamoru |
05f4829 |
+ echo -n $"daemon already running."
|
|
TASAKA Mamoru |
05f4829 |
+ failure
|
|
TASAKA Mamoru |
05f4829 |
+ echo
|
|
TASAKA Mamoru |
05f4829 |
+ RETVAL=1
|
|
TASAKA Mamoru |
05f4829 |
+ return $RETVAL
|
|
TASAKA Mamoru |
05f4829 |
+ fi
|
|
TASAKA Mamoru |
05f4829 |
|
|
TASAKA Mamoru |
05f4829 |
if test "$XTTPD_FEEDBACK"; then
|
|
TASAKA Mamoru |
05f4829 |
- daemon $DAEMON $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME
|
|
TASAKA Mamoru |
05f4829 |
+ $DAEMON $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME
|
|
TASAKA Mamoru |
05f4829 |
RETVAL=$?
|
|
TASAKA Mamoru |
05f4829 |
else
|
|
TASAKA Mamoru |
05f4829 |
- daemon $DAEMON $PORT HOME=$HOME
|
|
TASAKA Mamoru |
05f4829 |
+ $DAEMON $PORT HOME=$HOME
|
|
TASAKA Mamoru |
05f4829 |
RETVAL=$?
|
|
TASAKA Mamoru |
05f4829 |
fi
|
|
TASAKA Mamoru |
05f4829 |
[ $RETVAL -eq 0 ] && touch $LOCK
|
|
TASAKA Mamoru |
05f4829 |
+ [ $RETVAL -eq 0 ] && pgrep -U xttpd -f $PROG > $PIDFILE
|
|
TASAKA Mamoru |
05f4829 |
echo
|
|
TASAKA Mamoru |
05f4829 |
return $RETVAL
|
|
TASAKA Mamoru |
05f4829 |
}
|
|
TASAKA Mamoru |
05f4829 |
@@ -57,6 +66,7 @@
|
|
TASAKA Mamoru |
05f4829 |
killproc $DAEMON
|
|
TASAKA Mamoru |
05f4829 |
RETVAL=$?
|
|
TASAKA Mamoru |
05f4829 |
[ $RETVAL -eq 0 ] && rm -f $LOCK
|
|
TASAKA Mamoru |
05f4829 |
+ [ $RETVAL -eq 0 ] && rm -f $PIDFILE
|
|
TASAKA Mamoru |
05f4829 |
echo
|
|
TASAKA Mamoru |
05f4829 |
return $RETVAL
|
|
TASAKA Mamoru |
05f4829 |
}
|