rpms/iprutils/F-8 iprutils-initscripts.patch, NONE, 1.1 iprutils.spec, 1.28, 1.29
Roman Rakus (rrakus)
fedora-extras-commits at redhat.com
Tue Aug 12 10:36:44 UTC 2008
- Previous message (by thread): rpms/Miro/devel Miro.spec,1.35,1.36
- Next message (by thread): rpms/netbeans-svnclientadapter/F-9 import.log, NONE, 1.1 netbeans-svnclientadapter.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rrakus
Update of /cvs/extras/rpms/iprutils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8467
Modified Files:
iprutils.spec
Added Files:
iprutils-initscripts.patch
Log Message:
Corrected init scripts. Fix: #243682
iprutils-initscripts.patch:
--- NEW FILE iprutils-initscripts.patch ---
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 @@
# 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
+# processname: iprdump
+# pidfile: /var/run/iprdump.pid
+#
+
+# Source function library
+. /etc/init.d/functions
+
+RETVAL=0
+
+prog=iprdump
+iprdump=/sbin/iprdump
+lockfile=/var/lock/subsys/iprdump
+pidfile=/var/run/iprdump.pid
start() {
echo -n "Starting ipr dump daemon"
if [ ! -d /sys/class/scsi_generic ] ; then
modprobe sg
fi
- start_daemon $IPRDUMP
-
+
+ daemon $iprdump
RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- log_success_msg " "
- else
- log_failure_msg " "
- fi
+ echo
+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprdump > $pidfile
return $RETVAL
}
stop() {
- echo -n "Shutting down ipr dump daemon"
- killproc $IPRDUMP
-
- 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 dump daemon"
- $0 stop && $0 start
- return $RETVAL
-}
-
-status() {
- echo -n "Checking for iprdump daemon: "
-
- pidofproc $IPRDUMP >& /dev/null
-
+ echo -n "Stopping iprdump: "
+ killproc $iprdump -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
+ 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
+ ;;
+
status)
- status
+ status $iprdump
+ RETVAL=$?
;;
*)
- echo "Usage: $0 {start|stop|status|restart|reload}"
- exit 1
+ echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+ RETVAL=3
;;
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 @@
# Short-Description: Start the iprupdate utility
# Description: Start the iprupdate utility
### END INIT INFO
-
-IPRUPDATE=/sbin/iprupdate
-test -x $IPRUPDATE || exit 5
-. /lib/lsb/init-functions
+#
+# chkconfig: 2345 20 80
+# description: Runs the IBM Power RAID adapter update daemon
+# processname: iprupdate
+# pidfile: /var/run/iprupdate.pid
+#
+
+# Source function library
+. /etc/init.d/functions
+
+RETVAL=0
+
+prog=iprupdate
+iprupdate=/sbin/iprupdate
+lockfile=/var/lock/subsys/iprupdate
+pidfile=/var/run/iprupdate.pid
start() {
- echo "Checking ipr microcode levels"
- if [ ! -d /sys/class/scsi_generic ] ; then
- modprobe sg
- fi
- $IPRUPDATE --daemon
-
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- echo -n "Completed ipr microcode updates"
- log_success_msg " "
- else
- echo -n "Completed ipr microcode updates"
- log_failure_msg " "
- fi
- return $RETVAL
-}
+ echo -n "Starting iprupdate: "
-stop() {
- echo -n "Shutting down ipr update daemon"
- killproc $IPRUPDATE
-
- 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
return $RETVAL
}
-status() {
- echo -n "Checking for ipr update daemon: "
-
- pidofproc $IPRUPDATE >& /dev/null
-
+stop() {
+ echo -n "Stopping iprupdate: "
+ killproc $iprupdate -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
- ;;
- stop)
- stop
- ;;
- restart)
- restart
- ;;
- reload)
- reload
- ;;
- status)
- status
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|reload}"
- exit 1
- ;;
+ start)
+ start
+ RETVAL=$?
+ ;;
+ 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
+ ;;
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
+
Index: iprutils.spec
===================================================================
RCS file: /cvs/extras/rpms/iprutils/F-8/iprutils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- iprutils.spec 12 Aug 2008 10:32:19 -0000 1.28
+++ iprutils.spec 12 Aug 2008 10:36:14 -0000 1.29
@@ -8,7 +8,7 @@
Source0: iprutils-%{version}-src.tgz
Patch0: iprutils-cflags.patch
-Patch2: iprutils-initscripts.patch
+Patch1: iprutils-initscripts.patch
URL: http://sourceforge.net/projects/iprdd/
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -25,7 +25,7 @@
%prep
%setup -q -n %{name}
%patch0 -p1
-%patch2 -p1 -b .initscripts
+%patch1 -p1 -b .initscripts
%build
CFLAGS=$RPM_OPT_FLAGS make
- Previous message (by thread): rpms/Miro/devel Miro.spec,1.35,1.36
- Next message (by thread): rpms/netbeans-svnclientadapter/F-9 import.log, NONE, 1.1 netbeans-svnclientadapter.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list