From 2e31f94eb505379390006cc04e1b869a510b4afc Mon Sep 17 00:00:00 2001 From: mchristi Date: Thu, 13 Jul 2006 21:57:49 +0000 Subject: [PATCH] update iscsi tools to match kernel update. This breaks backwards compat so yo must upgrade the kernel, tools and DB --- .cvsignore | 2 ++ iscsi-initiator-utils.spec | 16 +++++-------- ....0.5.595-update-initscripts-and-docs.patch | 24 ------------------- sources | 2 +- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/.cvsignore b/.cvsignore index c9d8285..b9bdeff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,5 @@ open-iscsi-5.0.4.446.tar.gz open-iscsi-5.0.5.476.tar.bz2 open-iscsi-5.0.5.595.tar.bz2 open-iscsi-6.0.5.595.tar.bz2 +open-iscsi-1.1-645.tar.bz2 +open-iscsi-6.1.1.645.tar.bz2 diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index eca30f8..b0808d2 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -1,15 +1,11 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils -Version: 6.0.5.595 -Release: 2.1.1 +Version: 6.1.1.645 +Release: 0 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2 Source1: iscsi.init Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch -Patch2: open-iscsi-5.0.5.595-rm-reopen-max.patch -Patch3: open-iscsi-5.0.5.595-fc-version.patch -Patch4: iscsi-initiator-utils-cflags.patch -Patch5: iscsistart-static.patch Group: System Environment/Daemons License: GPL @@ -29,10 +25,6 @@ Protocol networks. %setup -q -n open-iscsi-%{version} %patch0 -p1 -b .update-initscripts-and-docs %patch1 -p1 -b .add-iscsi-iname -%patch2 -p1 -b .rm-reopen-max -%patch3 -p1 -b .fc-version -%patch4 -p1 -b .cflags -%patch5 -p1 -b .static %build make OPTFLAGS="%{optflags}" -C usr @@ -76,6 +68,10 @@ fi %{_mandir}/*/* %changelog +* Thu Jul 13 2006 Mike Christie - 6.1.1.645 +- update to upstream 1.1.645 +- Note DB and interface changed so you must update kernel, tools and DB + * Wed Jul 12 2006 Jesse Keating - 6.0.5.595-2.1.1 - rebuild diff --git a/open-iscsi-5.0.5.595-update-initscripts-and-docs.patch b/open-iscsi-5.0.5.595-update-initscripts-and-docs.patch index 39f20f5..bc8855b 100644 --- a/open-iscsi-5.0.5.595-update-initscripts-and-docs.patch +++ b/open-iscsi-5.0.5.595-update-initscripts-and-docs.patch @@ -1,15 +1,3 @@ -diff -aurp open-iscsi/etc/initd/initd.redhat open-iscsi.work/etc/initd/initd.redhat ---- open-iscsi/etc/initd/initd.redhat 2006-05-30 01:51:42.000000000 -0500 -+++ open-iscsi.work/etc/initd/initd.redhat 2006-05-30 03:57:03.000000000 -0500 -@@ -37,7 +37,7 @@ start_iscsid() - TARGETS=`$ISCSIADM -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1@g'` - for rec in $TARGETS - do -- STARTUP=`$ISCSIADM -m node -r $rec | grep "node.conn\[0\].startup" | cut -d' ' -f3` -+ STARTUP=`$ISCSIADM -m node -r $rec | grep "node.startup" | cut -d' ' -f3` - if [ $STARTUP = "automatic" ] - then - $ISCSIADM -m node -r $rec -l diff -aurp open-iscsi/etc/iscsid.conf open-iscsi.work/etc/iscsid.conf --- open-iscsi/etc/iscsid.conf 2006-05-30 01:51:42.000000000 -0500 +++ open-iscsi.work/etc/iscsid.conf 2006-05-30 03:57:10.000000000 -0500 @@ -30,15 +18,3 @@ diff -aurp open-iscsi/etc/iscsid.conf open-iscsi.work/etc/iscsid.conf #discovery.sendtargets.auth.authmethod = CHAP #discovery.sendtargets.auth.username = dima #discovery.sendtargets.auth.password = aloha -diff -aurp open-iscsi/README open-iscsi.work/README ---- open-iscsi/README 2006-05-30 01:51:42.000000000 -0500 -+++ open-iscsi.work/README 2006-05-30 03:57:03.000000000 -0500 -@@ -353,7 +353,7 @@ node discovered in the discovery above: - Or to set the "node.conn[0].statup" attribute to "startup" as default for - all sessions add the following to the /etc/iscsid.conf: - -- node.conn[0].startup = automatic -+ node.startup = automatic - - To login to all the automated nodes, simply restart the iscsi service - e.g /etc/init.d/open-iscsi restart diff --git a/sources b/sources index 911732a..5b9ad3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ec82582f551929fe1dfec578079d0bf open-iscsi-6.0.5.595.tar.bz2 +46938978c78168de917f73f9e53c9425 open-iscsi-6.1.1.645.tar.bz2