* Tue Sep 5 2006 Jeremy Katz <katzj@redhat.com> - 6.1.1.685-0.1

- Fix service startup
- Fix another case where cflags weren't being used
This commit is contained in:
katzj 2006-09-05 20:51:31 +00:00
parent e658c16bbb
commit 3d752876c4
3 changed files with 8 additions and 4 deletions

View File

@ -1,7 +1,7 @@
Summary: iSCSI daemon and utility programs Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils Name: iscsi-initiator-utils
Version: 6.1.1.685 Version: 6.1.1.685
Release: 0 Release: 0.1
Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-6.1.1.685.tar.bz2 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-6.1.1.685.tar.bz2
Source1: iscsi.init Source1: iscsi.init
Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
@ -67,6 +67,10 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Tue Sep 5 2006 Jeremy Katz <katzj@redhat.com> - 6.1.1.685-0.1
- Fix service startup
- Fix another case where cflags weren't being used
* Mon Aug 28 2006 Mike Christie <mchristie@redhat.com> - 6.1.1.685 * Mon Aug 28 2006 Mike Christie <mchristie@redhat.com> - 6.1.1.685
- Rebase to upstream to bring in many bug fixes and rm db. - Rebase to upstream to bring in many bug fixes and rm db.
- iscsi uses /etc/iscsi instead of just etc now - iscsi uses /etc/iscsi instead of just etc now

View File

@ -18,7 +18,7 @@ start()
{ {
echo -n $"Starting iSCSI initiator service: " echo -n $"Starting iSCSI initiator service: "
modprobe -q iscsi_tcp modprobe -q iscsi_tcp
daemon iscsid daemon --pidfile=/etc/iscsi/iscsid.pid iscsid
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] || return [ $RETVAL -eq 0 ] || return

View File

@ -167,13 +167,13 @@ diff -Naurp open-iscsi/utils/Makefile open-iscsi-5.0.5.595/utils/Makefile
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+# This Makefile will work only with GNU make. +# This Makefile will work only with GNU make.
+ +
+CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g +CFLAGS += $(OPTFLAGS) -O2 -fno-inline -Wall -Wstrict-prototypes -g
+PROGRAMS = iscsi-iname +PROGRAMS = iscsi-iname
+ +
+all: $(PROGRAMS) +all: $(PROGRAMS)
+ +
+iscsi-iname: md5.o iscsi-iname.o +iscsi-iname: md5.o iscsi-iname.o
+ $(CC) $^ $(DBM_LIB) -o $@ + $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
+ +
+clean: +clean:
+ rm -f *.o $(PROGRAMS) + rm -f *.o $(PROGRAMS)