From 3d752876c41f41f17caf2cd8a20acd02a9205d22 Mon Sep 17 00:00:00 2001 From: katzj Date: Tue, 5 Sep 2006 20:51:31 +0000 Subject: [PATCH] * Tue Sep 5 2006 Jeremy Katz - 6.1.1.685-0.1 - Fix service startup - Fix another case where cflags weren't being used --- iscsi-initiator-utils.spec | 6 +++++- iscsi.init | 2 +- open-iscsi-5.0.5.595-add-iscsi-iname.patch | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index f76a91f..dfc349e 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,7 +1,7 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils 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 Source1: iscsi.init Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch @@ -67,6 +67,10 @@ fi %{_mandir}/*/* %changelog +* Tue Sep 5 2006 Jeremy Katz - 6.1.1.685-0.1 +- Fix service startup +- Fix another case where cflags weren't being used + * Mon Aug 28 2006 Mike Christie - 6.1.1.685 - Rebase to upstream to bring in many bug fixes and rm db. - iscsi uses /etc/iscsi instead of just etc now diff --git a/iscsi.init b/iscsi.init index 64feae3..b244083 100755 --- a/iscsi.init +++ b/iscsi.init @@ -18,7 +18,7 @@ start() { echo -n $"Starting iSCSI initiator service: " modprobe -q iscsi_tcp - daemon iscsid + daemon --pidfile=/etc/iscsi/iscsid.pid iscsid RETVAL=$? echo [ $RETVAL -eq 0 ] || return diff --git a/open-iscsi-5.0.5.595-add-iscsi-iname.patch b/open-iscsi-5.0.5.595-add-iscsi-iname.patch index 8cf83e5..43f156a 100644 --- a/open-iscsi-5.0.5.595-add-iscsi-iname.patch +++ b/open-iscsi-5.0.5.595-add-iscsi-iname.patch @@ -167,13 +167,13 @@ diff -Naurp open-iscsi/utils/Makefile open-iscsi-5.0.5.595/utils/Makefile @@ -0,0 +1,12 @@ +# 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 + +all: $(PROGRAMS) + +iscsi-iname: md5.o iscsi-iname.o -+ $(CC) $^ $(DBM_LIB) -o $@ ++ $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ + +clean: + rm -f *.o $(PROGRAMS)