--- xtide-2.14/scripts/Fedora/rc.xttpd.pid_rc 2006-11-25 07:03:03.000000000 +0900 +++ xtide-2.14/scripts/Fedora/rc.xttpd 2015-12-30 23:37:17.110917961 +0900 @@ -6,13 +6,14 @@ # description: Harmonic tide clock and tide predictor server # processname: xttpd # config: /etc/sysconfig/xttpd -# pidfile: /var/run/xttpd.pid +# pidfile: /var/run/xttpd/xttpd.pid # PATH=/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin CONFIG=/etc/sysconfig/xttpd LOCK=/var/lock/subsys/xttpd +PIDFILE=/var/run/xttpd/xttpd.pid # Source function library. . /etc/rc.d/init.d/functions @@ -40,13 +41,8 @@ return $RETVAL fi - if test "$XTTPD_FEEDBACK"; then - daemon $DAEMON $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME + daemon --pidfile $PIDFILE $DAEMON $PORT XTTPD_FEEDBACK=$XTTPD_FEEDBACK HOME=$HOME RETVAL=$? - else - daemon $DAEMON $PORT HOME=$HOME - RETVAL=$? - fi [ $RETVAL -eq 0 ] && touch $LOCK echo return $RETVAL @@ -54,7 +50,7 @@ stop(){ echo -n $"Stopping $PROG: " - killproc $DAEMON + killproc -p $PIDFILE $DAEMON RETVAL=$? [ $RETVAL -eq 0 ] && rm -f $LOCK echo @@ -67,7 +63,7 @@ } status_xttpd(){ - status $PROG + status -p $PIDFILE $PROG } case "$1" in