rpms/iprutils/devel iprutils-initscripts.patch, 1.4, 1.5 iprutils.spec, 1.40, 1.41
Roman Rakus
rrakus at fedoraproject.org
Mon Oct 5 13:20:06 UTC 2009
- Previous message (by thread): rpms/mlocate/F-12 .cvsignore, 1.14, 1.15 mlocate.spec, 1.26, 1.27 sources, 1.14, 1.15
- Next message (by thread): rpms/kdelibs/devel .cvsignore, 1.79, 1.80 kdelibs.spec, 1.518, 1.519 sources, 1.95, 1.96 kdelibs-4.3.1-kde186763.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rrakus
Update of /cvs/extras/rpms/iprutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15067
Modified Files:
iprutils-initscripts.patch iprutils.spec
Log Message:
Fixed initscripts (#522464, #522462, #522461)
iprutils-initscripts.patch:
iprdump | 110 ++++++++++++++++++++++++++++----------------------
iprinit | 109 +++++++++++++++++++++++++++----------------------
iprupdate | 136 +++++++++++++++++++++++++++++++++-----------------------------
3 files changed, 197 insertions(+), 158 deletions(-)
Index: iprutils-initscripts.patch
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/iprutils-initscripts.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- iprutils-initscripts.patch 2 Feb 2009 18:38:04 -0000 1.4
+++ iprutils-initscripts.patch 5 Oct 2009 13:20:06 -0000 1.5
@@ -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.initscr
+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.initscr
- 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.initscr
- 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
++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/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
-
-+ echo -n "Stopping iprdump: "
-+ killproc $iprdump -TERM
+-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
-+ rm -f $lockfile $pidfile
-+ [ $RETVAL = 0 ] || return $RETVAL
++rh_status_q() {
++ rh_status >/dev/null 2>&1
}
++
case "$1" in
start)
- start
-+ RETVAL=$?
- ;;
+- start
+- ;;
++ rh_status_q && exit 0
++ $1
++ ;;
stop)
- stop
-+ RETVAL=$?
- ;;
-- restart)
+- stop
+- ;;
++ rh_status_q || exit 0
++ $1
++ ;;
+ 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
+- ;;
++ $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/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.inits
+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.inits
- 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() {
+- fi
++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile
+ return $RETVAL
+ }
+
+ restart() {
- $0 stop
- $0 start
- return $RETVAL
--}
++ stop
++ start
+ }
--reload() {
+ reload() {
- $0 stop
- $0 start
-+ daemon $iprupdate --daemon
-+ RETVAL=$?
-+ echo
-+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprupdate > $pidfile
- return $RETVAL
+- 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.inits
- exit 1
- ;;
+ start)
-+ start
-+ RETVAL=$?
++ rh_status_q && exit 0
++ $1
+ ;;
+ stop)
-+ 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 $iprupdate
-+ RETVAL=$?
-+ ;;
-+ *)
-+ echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-+ RETVAL=3
++ rh_status_q || exit 0
++ $1
+ ;;
- 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=$?
++ restart)
++ $1
+ ;;
- stop)
-- stop
-- ;;
-- restart)
-- restart
-- ;;
-- reload)
-- reload
-- ;;
-+ stop
-+ RETVAL=$?
++ reload)
++ rh_status_q || exit 7
++ $1
+ ;;
-+ restart|force-reload)
-+ stop ; start
-+ RETVAL=$?
-+ ;;
-+ try-restart|reload|configtest)
-+ RETVAL=3
-+ ;;
-+ condrestart)
-+ if [ -f $lockfile ]; then
-+ stop ; start
-+ RETVAL=$?
-+ fi
++ force-reload)
++ force_reload
+ ;;
- status)
-- status
-- ;;
-+ status $iprinit
-+ RETVAL=$?
++ status)
++ rh_status
+ ;;
- *)
-- echo "Usage: $0 {start|stop|status|restart|reload}"
-- exit 1
-- ;;
-+ echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-+ RETVAL=3
++ condrestart|try-restart)
++ rh_status_q || exit 0
++ restart
+ ;;
++ *)
++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++ exit 2
esac
++exit $?
+
Index: iprutils.spec
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- iprutils.spec 17 Sep 2009 08:01:19 -0000 1.40
+++ iprutils.spec 5 Oct 2009 13:20:06 -0000 1.41
@@ -1,7 +1,7 @@
Summary: Utilities for the IBM Power Linux RAID adapters
Name: iprutils
Version: 2.2.17
-Release: 1%{?dist}
+Release: 2%{?dist}
License: CPL
Group: System Environment/Base
URL: http://sourceforge.net/projects/iprdd/
@@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make}
%{_sysconfdir}/rc.d/init.d/*
%changelog
+* Mon Oct 05 2009 Roman Rakus <rrakus at redhat.com> - 2.2.17-2
+- Fixed initscripts (#522464, #522462, #522461)
+
* Thu Sep 17 2009 Roman Rakus <rrakus at redhat.com> - 2.2.17-1
- Version 2.2.17
- Previous message (by thread): rpms/mlocate/F-12 .cvsignore, 1.14, 1.15 mlocate.spec, 1.26, 1.27 sources, 1.14, 1.15
- Next message (by thread): rpms/kdelibs/devel .cvsignore, 1.79, 1.80 kdelibs.spec, 1.518, 1.519 sources, 1.95, 1.96 kdelibs-4.3.1-kde186763.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list