Author: lkundrak Update of /cvs/free/rpms/iscsitarget/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv10174 Modified Files: .cvsignore iscsitarget.spec sources Added Files: iscsitarget-1.4.18-initscript.patch Removed Files: iscsitarget-0.4.15-initscript.patch Log Message: * Sun Nov 01 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 1:1.4.18-1 - Update to new upstream release iscsitarget-1.4.18-initscript.patch: --- NEW FILE iscsitarget-1.4.18-initscript.patch --- diff -up iscsitarget-1.4.18/etc/initd/initd.redhat.initscript iscsitarget-1.4.18/etc/initd/initd.redhat --- iscsitarget-1.4.18/etc/initd/initd.redhat.initscript 2009-09-21 20:28:14.000000000 +0200 +++ iscsitarget-1.4.18/etc/initd/initd.redhat 2009-11-01 14:29:57.074823142 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # chkconfig: - 39 35 # description: Starts and stops the iSCSI target @@ -6,7 +6,14 @@ # pidfile: /var/run/ietd.pid # config: /etc/ietd.conf -PATH=/sbin:/bin:/usr/sbin:/usr/bin +### BEGIN INIT INFO +# Provides: iscsi-target +# Required-Start: $local_fs $network $remote_fs $syslog +# Required-Stop: $local_fs $network $remote_fs $syslog +# Short-Description: start and stop ietd +# Description: Starts and stops the iSCSI target +### END INIT INFO + OPTIONS="" # Source function library. @@ -27,11 +34,15 @@ RETVAL=0 start() { echo -n "Starting iSCSI Target: " - modprobe -q crc32c + # 2> /dev/null for kernels where regular crc32c is build in, as there + # modprobe will sometimes pick a CPU specific one which will then fail + # if not loaded on the right CPU, ie crc32c_intel on an amd64 + modprobe crc32c 2> /dev/null modprobe iscsi_trgt daemon /usr/sbin/ietd $OPTIONS RETVAL=$? if [ $RETVAL -eq 0 ]; then + touch /var/lock/subsys/iscsi-target echo_success else echo_failure @@ -48,6 +59,7 @@ stop() modprobe -r iscsi_trgt RETVAL=$? if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/iscsi-target echo_success else echo_failure @@ -71,6 +83,16 @@ condrestart() fi } +try-restart() +{ + condrestart +} + +force-reload() +{ + try-restart +} + status() { PID=`pidofproc ietd` @@ -99,7 +121,7 @@ case "$1" in status ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|try-restart|force-reload|status}" exit 1 esac Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/iscsitarget/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2009 16:33:27 -0000 1.3 +++ .cvsignore 1 Nov 2009 13:32:47 -0000 1.4 @@ -1 +1 @@ -iscsitarget-0.4.17.tar.gz +iscsitarget-1.4.18.tar.gz Index: iscsitarget.spec =================================================================== RCS file: /cvs/free/rpms/iscsitarget/devel/iscsitarget.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- iscsitarget.spec 13 Sep 2009 18:08:38 -0000 1.7 +++ iscsitarget.spec 1 Nov 2009 13:32:47 -0000 1.8 @@ -1,6 +1,6 @@ Name: iscsitarget -Version: 0.4.17 -Release: 5%{?dist} +Version: 1.4.18 +Release: 1%{?dist} Epoch: 1 Summary: Utilities for iSCSI Enterprise Target @@ -8,7 +8,7 @@ License: GPLv2 URL: http://sourceforge.net/projects/iscsitarget/ Source0: http://dl.sf.net/iscsitarget/%{name}-%{version}.tar.gz -Patch1: iscsitarget-0.4.15-initscript.patch +Patch1: iscsitarget-1.4.18-initscript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-kmod >= %{epoch}:%{version} @@ -73,6 +73,9 @@ %changelog +* Sun Nov 01 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 1:1.4.18-1 +- Update to new upstream release + * Sun Sep 13 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; - 1:0.4.17-5 - silence crc32c_intel loading failure on amd machines Index: sources =================================================================== RCS file: /cvs/free/rpms/iscsitarget/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2009 16:33:27 -0000 1.3 +++ sources 1 Nov 2009 13:32:47 -0000 1.4 @@ -1 +1 @@ -e79b437695fc50e7d054631855a16b1b iscsitarget-0.4.17.tar.gz +9e756e89cc47aaa71824ed34a6560543 iscsitarget-1.4.18.tar.gz --- iscsitarget-0.4.15-initscript.patch DELETED ---