diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 302ab1d..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -iprutils-2.2.17-src.tgz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..68a48b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +iprutils-2.2.18-src.tgz diff --git a/Makefile b/Makefile deleted file mode 100644 index 7872342..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: iprutils -# $Id: Makefile,v 1.1 2004/09/09 06:18:32 cvsdist Exp $ -NAME := iprutils -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch index afbf955..0641491 100644 --- a/iprutils-initscripts.patch +++ b/iprutils-initscripts.patch @@ -1,15 +1,10 @@ -diff -up iprutils/init.d/iprha.initscript iprutils/init.d/iprha -diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump ---- iprutils/init.d/iprdump.initscript 2007-06-21 15:44:33.000000000 +0200 -+++ iprutils/init.d/iprdump 2008-04-09 16:46:13.000000000 +0200 -@@ -20,84 +20,74 @@ +diff -up iprutils/init.d/iprdump.initscripts iprutils/init.d/iprdump +--- iprutils/init.d/iprdump.initscripts 2008-11-20 02:20:20.000000000 +0100 ++++ iprutils/init.d/iprdump 2009-10-05 13:46:41.000000000 +0200 +@@ -20,84 +20,98 @@ # Short-Description: Start the ipr dump daemon # Description: Start the ipr dump daemon ### END INIT INFO -- --IPRDUMP=/sbin/iprdump --test -x $IPRDUMP || exit 5 --. /lib/lsb/init-functions +# +# chkconfig: 2345 20 80 +# description: Runs the IBM Power RAID adapter dump daemon @@ -23,19 +18,25 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump +RETVAL=0 + +prog=iprdump -+iprdump=/sbin/iprdump ++exec=/sbin/iprdump +lockfile=/var/lock/subsys/iprdump +pidfile=/var/run/iprdump.pid +-IPRDUMP=/sbin/iprdump +-test -x $IPRDUMP || exit 5 +-. /lib/lsb/init-functions + start() { - echo -n "Starting ipr dump daemon" +- echo -n "Starting ipr dump daemon" ++ [ -x $exec ] || exit 5 ++ echo -n "Starting $prog: " if [ ! -d /sys/class/scsi_generic ] ; then modprobe sg fi - start_daemon $IPRDUMP --daemon - + -+ daemon $iprdump --daemon ++ daemon $exec --daemon RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg " " @@ -43,7 +44,7 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump - log_failure_msg " " - fi + echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprdump > $pidfile ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile return $RETVAL } @@ -51,88 +52,255 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump - echo -n "Shutting down ipr dump daemon" - killproc $IPRDUMP - -- RETVAL=$? ++ echo -n "Stopping $prog: " ++ killproc $exec -TERM + RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg " " - else - log_failure_msg " " - fi -- return $RETVAL --} -- --restart() { ++ echo ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile + return $RETVAL + } + + restart() { - $0 stop - $0 start - return $RETVAL --} -- --reload() { ++ stop ++ start + } + + reload() { - echo -n "Reload ipr dump daemon" - $0 stop && $0 start - return $RETVAL --} -- ++ restart + } + -status() { - echo -n "Checking for iprdump daemon: " -- ++force_reload() { ++ restart ++} + - pidofproc $IPRDUMP >& /dev/null -- -+ echo -n "Stopping iprdump: " -+ killproc $iprdump -TERM - RETVAL=$? ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg "running" - else - log_failure_msg "unused" - fi - return $RETVAL -+ rm -f $lockfile $pidfile -+ [ $RETVAL = 0 ] || return $RETVAL ++rh_status_q() { ++ rh_status >/dev/null 2>&1 } case "$1" in start) - start -+ RETVAL=$? - ;; - stop) - stop -+ RETVAL=$? - ;; -- restart) -- restart -+ restart|force-reload) -+ stop; start -+ RETVAL=$? - ;; -- reload) -+ try-restart|reload|configtest) -+ RETVAL=3 - reload - ;; -+ condrestart) -+ if [ -f $lockfile ]; then -+ stop ; start -+ RETVAL=$? -+ fi +- start +- ;; ++ rh_status_q && exit 0 ++ $1 ++ ;; + stop) +- stop +- ;; ++ rh_status_q || exit 0 ++ $1 ++ ;; + restart) +- restart +- ;; ++ $1 ++ ;; + reload) +- reload +- ;; ++ rh_status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload + ;; -+ status) - status -+ status $iprdump -+ RETVAL=$? - ;; +- ;; ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart ++ ;; *) - echo "Usage: $0 {start|stop|status|restart|reload}" - exit 1 -+ echo $"Usage: $0 {start|stop|restart|condrestart|status}" -+ RETVAL=3 - ;; +- ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 esac -diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate ---- iprutils/init.d/iprupdate.initscript 2007-06-21 15:45:29.000000000 +0200 -+++ iprutils/init.d/iprupdate 2008-04-09 17:18:29.000000000 +0200 -@@ -20,86 +20,74 @@ ++exit $? ++ +diff -up iprutils/init.d/iprinit.initscripts iprutils/init.d/iprinit +--- iprutils/init.d/iprinit.initscripts 2007-08-21 20:56:03.000000000 +0200 ++++ iprutils/init.d/iprinit 2009-10-05 14:59:18.000000000 +0200 +@@ -20,84 +20,97 @@ + # Short-Description: Start the ipr init daemon + # Description: Start the ipr initialization daemon + ### END INIT INFO +- +-IPRINIT=/sbin/iprinit +-test -x $IPRINIT || exit 5 +-. /lib/lsb/init-functions ++# ++# chkconfig: 2345 20 80 ++# description: Runs the IBM Power RAID adapter initialization daemon ++# processname: iprinit ++# pidfile: /var/run/iprinit.pid ++# ++ ++# Source function library ++. /etc/init.d/functions ++ ++RETVAL=0 ++ ++prog=iprinit ++exec=/sbin/iprinit ++lockfile=/var/lock/subsys/$prog ++pidfile=/var/run/iprinit.pid + + start() { +- echo -n "Starting ipr initialization daemon" ++ [ -x $exec ] || exit 5 ++ echo -n "Starting $prog: " + if [ ! -d /sys/class/scsi_generic ] ; then + modprobe sg + fi +- start_daemon $IPRINIT --daemon ++ daemon $exec --daemon + + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile + return $RETVAL + } + + stop() { +- echo -n "Shutting down ipr initialization daemon" +- killproc $IPRINIT +- ++ echo -n "Stopping iprinit: " ++ killproc $exec -TERM + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile + return $RETVAL + } + + restart() { +- $0 stop +- $0 start +- return $RETVAL ++ stop ++ start + } + + reload() { +- echo -n "Reload ipr initialization daemon" +- $0 stop && $0 start +- return $RETVAL ++ restart + } + +-status() { +- echo -n "Checking for ipr initialization daemon: " ++force_reload() { ++ restart ++} + +- pidofproc $IPRINIT >& /dev/null ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg "running" +- else +- log_failure_msg "unused" +- fi +- return $RETVAL ++rh_status_q() { ++ rh_status >/dev/null 2>&1 + } + ++ + case "$1" in + start) +- start +- ;; ++ rh_status_q && exit 0 ++ $1 ++ ;; + stop) +- stop +- ;; ++ rh_status_q || exit 0 ++ $1 ++ ;; + restart) +- restart +- ;; ++ $1 ++ ;; + reload) +- reload +- ;; ++ rh_status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload ++ ;; + status) +- status +- ;; ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart ++ ;; + *) +- echo "Usage: $0 {start|stop|status|restart|reload}" +- exit 1 +- ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 + esac ++exit $? ++ +diff -up iprutils/init.d/iprupdate.initscripts iprutils/init.d/iprupdate +--- iprutils/init.d/iprupdate.initscripts 2008-11-20 02:20:20.000000000 +0100 ++++ iprutils/init.d/iprupdate 2009-10-05 15:04:50.000000000 +0200 +@@ -20,86 +20,98 @@ # Short-Description: Start the iprupdate utility # Description: Start the iprupdate utility ### END INIT INFO @@ -153,7 +321,7 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate +RETVAL=0 + +prog=iprupdate -+iprupdate=/sbin/iprupdate ++exec=/sbin/iprupdate +lockfile=/var/lock/subsys/iprupdate +pidfile=/var/run/iprupdate.pid @@ -173,59 +341,75 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate - log_failure_msg " " - fi - return $RETVAL --} ++ [ -x $exec ] || exit 5 + echo -n "Starting iprupdate: " ++ ++ if [ ! -d /sys/class/scsi_generic ]; then ++ modprobe sg ++ fi ++ ++ daemon $exec --daemon ++ RETVAL=$? ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile ++ return $RETVAL + } --stop() { + stop() { - echo -n "Shutting down ipr update daemon" - killproc $IPRUPDATE - -- RETVAL=$? ++ echo -n "Stopping iprupdate: " ++ killproc $exec -TERM + RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg " " - else - log_failure_msg " " -+ if [ ! -d /sys/class/scsi_generic ]; then -+ modprobe sg - fi -- return $RETVAL --} -- --restart() { -- $0 stop -- $0 start -- return $RETVAL --} - --reload() { -- $0 stop -- $0 start -+ daemon $iprupdate --daemon -+ RETVAL=$? -+ echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprupdate > $pidfile +- fi ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } + restart() { +- $0 stop +- $0 start +- return $RETVAL ++ stop ++ start + } + + reload() { +- $0 stop +- $0 start +- return $RETVAL ++ restart + } + -status() { - echo -n "Checking for ipr update daemon: " -- ++force_reload() { ++ restart ++} + - pidofproc $IPRUPDATE >& /dev/null -- -+stop() { -+ echo -n "Stopping iprupdate: " -+ killproc $iprupdate -TERM - RETVAL=$? ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg "running" - else - log_failure_msg "unused" - fi - return $RETVAL -+ rm -f $lockfile $pidfile -+ [ $RETVAL = 0 ] || return $RETVAL ++rh_status_q() { ++ rh_status >/dev/null 2>&1 } ++ case "$1" in - start) - start @@ -247,171 +431,33 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate - exit 1 - ;; + start) -+ start -+ RETVAL=$? ++ rh_status_q && exit 0 ++ $1 + ;; + stop) -+ stop -+ RETVAL=$? ++ rh_status_q || exit 0 ++ $1 + ;; -+ restart|force-reload) -+ stop ; start -+ RETVAL=$? ++ restart) ++ $1 + ;; -+ try-restart|reload|configtest) -+ RETVAL=3 ++ reload) ++ rh_status_q || exit 7 ++ $1 + ;; -+ condrestart) -+ if [ -f $lockfile ]; then -+ stop ; start -+ RETVAL=$? -+ fi ++ force-reload) ++ force_reload + ;; + status) -+ status $iprupdate -+ RETVAL=$? ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart + ;; + *) -+ echo $"Usage: $0 {start|stop|restart|condrestart|status}" -+ RETVAL=3 -+ ;; - esac -+ -diff -up iprutils/init.d/iprinit.initscript iprutils/init.d/iprinit ---- iprutils/init.d/iprinit.initscript 2007-06-21 15:46:37.000000000 +0200 -+++ iprutils/init.d/iprinit 2008-04-09 17:03:38.000000000 +0200 -@@ -20,84 +20,73 @@ - # Short-Description: Start the ipr init daemon - # Description: Start the ipr initialization daemon - ### END INIT INFO -- --IPRINIT=/sbin/iprinit --test -x $IPRINIT || exit 5 --. /lib/lsb/init-functions -+# -+# chkconfig: 2345 20 80 -+# description: Runs the IBM Power RAID adapter initialization daemon -+# processname: iprinit -+# pidfile: /var/run/iprinit.pid -+# -+ -+# Source function library -+. /etc/init.d/functions -+ -+RETVAL=0 -+ -+prog=iprinit -+iprinit=/sbin/iprinit -+lockfile=/var/lock/subsys/iprinit -+pidfile=/var/run/iprinit.pid - - start() { -- echo -n "Starting ipr initialization daemon" -+ echo -n "Starting iprinit: " - if [ ! -d /sys/class/scsi_generic ] ; then - modprobe sg - fi -- start_daemon $IPRINIT --daemon -+ daemon $iprinit --daemon - - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprinit > $pidfile - return $RETVAL - } - - stop() { -- echo -n "Shutting down ipr initialization daemon" -- killproc $IPRINIT -- -- RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -- return $RETVAL --} -- --restart() { -- $0 stop -- $0 start -- return $RETVAL --} -- --reload() { -- echo -n "Reload ipr initialization daemon" -- $0 stop && $0 start -- return $RETVAL --} -- --status() { -- echo -n "Checking for ipr initialization daemon: " -- -- pidofproc $IPRINIT >& /dev/null -- -+ echo -n "Stopping iprinit: " -+ killproc $iprinit -TERM - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -- else -- log_failure_msg "unused" -- fi -- return $RETVAL -+ rm -f $lockfile $pidfile -+ [ $RETVAL = 0 ] || return $RETVAL - } - - case "$1" in - start) -- start -- ;; -+ start -+ RETVAL=$? -+ ;; - stop) -- stop -- ;; -- restart) -- restart -- ;; -- reload) -- reload -- ;; -+ stop -+ RETVAL=$? -+ ;; -+ restart|force-reload) -+ stop ; start -+ RETVAL=$? -+ ;; -+ try-restart|reload|configtest) -+ RETVAL=3 -+ ;; -+ condrestart) -+ if [ -f $lockfile ]; then -+ stop ; start -+ RETVAL=$? -+ fi -+ ;; - status) -- status -- ;; -+ status $iprinit -+ RETVAL=$? -+ ;; - *) -- echo "Usage: $0 {start|stop|status|restart|reload}" -- exit 1 -- ;; -+ echo $"Usage: $0 {start|stop|restart|condrestart|status}" -+ RETVAL=3 -+ ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 esac ++exit $? + diff --git a/iprutils.spec b/iprutils.spec index 9bf96c8..39907e2 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,6 +1,6 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.2.17 +Version: 2.2.18 Release: 1%{?dist} License: CPL Group: System Environment/Base @@ -64,6 +64,10 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Nov 04 2009 Roman Rakus - 2.2.18-1 +- Version 2.2.18 +- Corrected initscripts + * Thu Sep 17 2009 Roman Rakus - 2.2.17-1 - Version 2.2.17 diff --git a/sources b/sources index 9c283b2..11d282e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b067fc42272d7883091b5ed44c47b42 iprutils-2.2.17-src.tgz +ec24e468174b84460587cc6cdf6f9561 iprutils-2.2.18-src.tgz