rpms/iprutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed initscripts (#522464, #522462, #522461)

Browse Source
This commit is contained in:
Roman Rakus 2009-10-05 13:20:06 +00:00
parent 0757182992
commit 38caa68c25
2 changed files with 302 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

550
iprutils-initscripts.patch
View File

@ -1,15 +1,10 @@
diff -up iprutils/init.d/iprha.initscript iprutils/init.d/iprha diff -up iprutils/init.d/iprdump.initscripts iprutils/init.d/iprdump
diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump --- iprutils/init.d/iprdump.initscripts 2008-11-20 02:20:20.000000000 +0100
--- iprutils/init.d/iprdump.initscript 2007-06-21 15:44:33.000000000 +0200 +++ iprutils/init.d/iprdump 2009-10-05 13:46:41.000000000 +0200
+++ iprutils/init.d/iprdump 2008-04-09 16:46:13.000000000 +0200 @@ -20,84 +20,98 @@
@@ -20,84 +20,74 @@
# Short-Description: Start the ipr dump daemon # Short-Description: Start the ipr dump daemon
# Description: Start the ipr dump daemon # Description: Start the ipr dump daemon
### END INIT INFO ### END INIT INFO
-
-IPRDUMP=/sbin/iprdump
-test -x $IPRDUMP || exit 5
-. /lib/lsb/init-functions
+# +#
+# chkconfig: 2345 20 80 +# chkconfig: 2345 20 80
+# description: Runs the IBM Power RAID adapter dump daemon +# 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 +RETVAL=0
+ +
+prog=iprdump +prog=iprdump
+iprdump=/sbin/iprdump +exec=/sbin/iprdump
+lockfile=/var/lock/subsys/iprdump +lockfile=/var/lock/subsys/iprdump
+pidfile=/var/run/iprdump.pid +pidfile=/var/run/iprdump.pid
-IPRDUMP=/sbin/iprdump
-test -x $IPRDUMP || exit 5
-. /lib/lsb/init-functions
start() { 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 if [ ! -d /sys/class/scsi_generic ] ; then
modprobe sg modprobe sg
fi fi
- start_daemon $IPRDUMP --daemon - start_daemon $IPRDUMP --daemon
- -
+ +
+ daemon $iprdump --daemon + daemon $exec --daemon
RETVAL=$? RETVAL=$?
- if [ $RETVAL -eq 0 ]; then - if [ $RETVAL -eq 0 ]; then
- log_success_msg " " - log_success_msg " "
@ -43,7 +44,7 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump
- log_failure_msg " " - log_failure_msg " "
- fi - fi
+ echo + echo
+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprdump > $pidfile + [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile
return $RETVAL return $RETVAL
} }
@ -51,88 +52,255 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump
- echo -n "Shutting down ipr dump daemon" - echo -n "Shutting down ipr dump daemon"
- killproc $IPRDUMP - killproc $IPRDUMP
- -
- RETVAL=$? + echo -n "Stopping $prog: "
+ killproc $exec -TERM
RETVAL=$?
- if [ $RETVAL -eq 0 ]; then - if [ $RETVAL -eq 0 ]; then
- log_success_msg " " - log_success_msg " "
- else - else
- log_failure_msg " " - log_failure_msg " "
- fi - fi
- return $RETVAL + echo
-} + [ $RETVAL = 0 ] && rm -f $lockfile $pidfile
- return $RETVAL
-restart() { }
restart() {
- $0 stop - $0 stop
- $0 start - $0 start
- return $RETVAL - return $RETVAL
-} + stop
- + start
-reload() { }
reload() {
- echo -n "Reload ipr dump daemon" - echo -n "Reload ipr dump daemon"
- $0 stop && $0 start - $0 stop && $0 start
- return $RETVAL - return $RETVAL
-} + restart
- }
-status() { -status() {
- echo -n "Checking for iprdump daemon: " - echo -n "Checking for iprdump daemon: "
- +force_reload() {
+ restart
+}
- pidofproc $IPRDUMP >& /dev/null - pidofproc $IPRDUMP >& /dev/null
- +rh_status() {
+ echo -n "Stopping iprdump: " + # run checks to determine if the service is running or use generic status
+ killproc $iprdump -TERM + status $prog
RETVAL=$? +}
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then - if [ $RETVAL -eq 0 ]; then
- log_success_msg "running" - log_success_msg "running"
- else - else
- log_failure_msg "unused" - log_failure_msg "unused"
- fi - fi
- return $RETVAL - return $RETVAL
+ rm -f $lockfile $pidfile +rh_status_q() {
+ [ $RETVAL = 0 ] || return $RETVAL + rh_status >/dev/null 2>&1
} }
case "$1" in case "$1" in
start) start)
start - start
+ RETVAL=$? - ;;
;; + rh_status_q && exit 0
stop) + $1
stop + ;;
+ RETVAL=$? stop)
;; - stop
- restart) - ;;
- restart + rh_status_q || exit 0
+ restart|force-reload) + $1
+ stop; start + ;;
+ RETVAL=$? restart)
;; - restart
- reload) - ;;
+ try-restart|reload|configtest) + $1
+ RETVAL=3 + ;;
reload reload)
;; - reload
+ condrestart) - ;;
+ if [ -f $lockfile ]; then + rh_status_q || exit 7
+ stop ; start + $1
+ RETVAL=$? + ;;
+ fi + force-reload)
+ force_reload
+ ;; + ;;
+
status) status)
- status - status
+ status $iprdump - ;;
+ RETVAL=$? + rh_status
;; + ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
*) *)
- echo "Usage: $0 {start|stop|status|restart|reload}" - echo "Usage: $0 {start|stop|status|restart|reload}"
- exit 1 - 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 esac
diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate +exit $?
--- 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 diff -up iprutils/init.d/iprinit.initscripts iprutils/init.d/iprinit
@@ -20,86 +20,74 @@ --- 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 # Short-Description: Start the iprupdate utility
# Description: Start the iprupdate utility # Description: Start the iprupdate utility
### END INIT INFO ### END INIT INFO
@ -153,7 +321,7 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate
+RETVAL=0 +RETVAL=0
+ +
+prog=iprupdate +prog=iprupdate
+iprupdate=/sbin/iprupdate +exec=/sbin/iprupdate
+lockfile=/var/lock/subsys/iprupdate +lockfile=/var/lock/subsys/iprupdate
+pidfile=/var/run/iprupdate.pid +pidfile=/var/run/iprupdate.pid
@ -173,59 +341,75 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate
- log_failure_msg " " - log_failure_msg " "
- fi - fi
- return $RETVAL - return $RETVAL
-} + [ -x $exec ] || exit 5
+ echo -n "Starting iprupdate: " + 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" - echo -n "Shutting down ipr update daemon"
- killproc $IPRUPDATE - killproc $IPRUPDATE
- -
- RETVAL=$? + echo -n "Stopping iprupdate: "
+ killproc $exec -TERM
RETVAL=$?
- if [ $RETVAL -eq 0 ]; then - if [ $RETVAL -eq 0 ]; then
- log_success_msg " " - log_success_msg " "
- else - else
- log_failure_msg " " - log_failure_msg " "
+ if [ ! -d /sys/class/scsi_generic ]; then - fi
+ modprobe sg + [ $RETVAL = 0 ] && rm -f $lockfile $pidfile
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
return $RETVAL return $RETVAL
} }
restart() {
- $0 stop
- $0 start
- return $RETVAL
+ stop
+ start
}
reload() {
- $0 stop
- $0 start
- return $RETVAL
+ restart
}
-status() { -status() {
- echo -n "Checking for ipr update daemon: " - echo -n "Checking for ipr update daemon: "
- +force_reload() {
+ restart
+}
- pidofproc $IPRUPDATE >& /dev/null - pidofproc $IPRUPDATE >& /dev/null
- +rh_status() {
+stop() { + # run checks to determine if the service is running or use generic status
+ echo -n "Stopping iprupdate: " + status $prog
+ killproc $iprupdate -TERM +}
RETVAL=$?
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then - if [ $RETVAL -eq 0 ]; then
- log_success_msg "running" - log_success_msg "running"
- else - else
- log_failure_msg "unused" - log_failure_msg "unused"
- fi - fi
- return $RETVAL - return $RETVAL
+ rm -f $lockfile $pidfile +rh_status_q() {
+ [ $RETVAL = 0 ] || return $RETVAL + rh_status >/dev/null 2>&1
} }
+
case "$1" in case "$1" in
- start) - start)
- start - start
@ -247,171 +431,33 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate
- exit 1 - exit 1
- ;; - ;;
+ start) + start)
+ start + rh_status_q && exit 0
+ RETVAL=$? + $1
+ ;; + ;;
+ stop) + stop)
+ stop + rh_status_q || exit 0
+ RETVAL=$? + $1
+ ;; + ;;
+ restart|force-reload) + restart)
+ stop ; start + $1
+ RETVAL=$?
+ ;; + ;;
+ try-restart|reload|configtest) + reload)
+ RETVAL=3 + rh_status_q || exit 7
+ $1
+ ;; + ;;
+ condrestart) + force-reload)
+ if [ -f $lockfile ]; then + force_reload
+ stop ; start
+ RETVAL=$?
+ fi
+ ;; + ;;
+ status) + status)
+ status $iprupdate + rh_status
+ RETVAL=$? + ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;; + ;;
+ *) + *)
+ echo $"Usage: $0 {start|stop|restart|condrestart|status}" + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ RETVAL=3 + exit 2
+ ;;
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
+ ;;
esac esac
+exit $?
+ +

5
iprutils.spec
View File

@ -1,7 +1,7 @@
Summary: Utilities for the IBM Power Linux RAID adapters Summary: Utilities for the IBM Power Linux RAID adapters
Name: iprutils Name: iprutils
Version: 2.2.17 Version: 2.2.17
Release: 1%{?dist} Release: 2%{?dist}
License: CPL License: CPL
Group: System Environment/Base Group: System Environment/Base
URL: http://sourceforge.net/projects/iprdd/ URL: http://sourceforge.net/projects/iprdd/
@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make}
%{_sysconfdir}/rc.d/init.d/* %{_sysconfdir}/rc.d/init.d/*
%changelog %changelog
* Mon Oct 05 2009 Roman Rakus <rrakus@redhat.com> - 2.2.17-2
- Fixed initscripts (#522464, #522462, #522461)
* Thu Sep 17 2009 Roman Rakus <rrakus@redhat.com> - 2.2.17-1 * Thu Sep 17 2009 Roman Rakus <rrakus@redhat.com> - 2.2.17-1
- Version 2.2.17 - Version 2.2.17