Hello community, here is the log from the commit of package open-iscsi checked in at Wed Apr 4 20:32:14 CEST 2007. -------- --- open-iscsi/open-iscsi.changes 2006-10-20 14:24:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/open-iscsi/open-iscsi.changes 2007-04-04 10:57:27.336862000 +0200 @@ -1,0 +2,73 @@ +Wed Apr 4 10:51:56 CEST 2007 - hare@suse.de + +- update to official release 2.0-754 +- update to svn r779 +- Include changes from SLES10 SP1 + +------------------------------------------------------------------- +Fri Mar 30 13:50:42 CEST 2007 - hare@suse.de + +- Include fwparam_ibft program for OpenPROM (#226682) + +------------------------------------------------------------------- +Wed Mar 28 12:24:23 CEST 2007 - hare@suse.de + +- Return status '6' when root on iSCSI is not enabled (#257979) + +------------------------------------------------------------------- +Fri Mar 16 11:51:33 CET 2007 - hare@suse.de + +- Fix typo in output of fwparam_ibft (#250445) + +------------------------------------------------------------------- +Thu Mar 8 12:49:39 CET 2007 - hare@suse.de + +- connect() to the daemon might fail on busy machines (#244649) + +------------------------------------------------------------------- +Mon Mar 5 16:29:05 CET 2007 - hare@suse.de + +- Add /usr/bin/iscsi-dbconvert to convert SLES10 GA + databases to new format (#251298) + +------------------------------------------------------------------- +Fri Feb 16 20:00:45 CET 2007 - hare@suse.de + +- Fix iscsiadm to print session info correctly (#243203) + +------------------------------------------------------------------- +Thu Feb 8 16:19:08 CET 2007 - hare@suse.de + +- update to svn r768 + - Update iSNS support (#243203) +- Correct typo in /etc/init.d/boot.open-iscsi (#243203) + +------------------------------------------------------------------- +Fri Feb 2 15:23:18 CET 2007 - hare@suse.de + +- Umount all luns on shutdown (#223484) + +------------------------------------------------------------------- +Wed Jan 31 09:43:38 CET 2007 - hare@suse.de + +- Remove the start iSCSI after Xen hack (#231077) +- Fixup /etc/init.d/boot.open-iscsi script (#239819) + +------------------------------------------------------------------- +Thu Jan 18 15:07:04 CET 2007 - hare@suse.de + +- Fix compat mode to display the record id. +- Add /sbin/iscsi-gen-initiatorname to generate + a default iSCSI initiatorname. + +------------------------------------------------------------------- +Mon Jan 15 17:47:13 CET 2007 - hare@suse.de + +- Fixup %post scripts. + +------------------------------------------------------------------- +Mon Jan 15 13:10:53 CET 2007 - hare@suse.de + +- Reference symlink to /etc/iscsid.conf in rpm. + +------------------------------------------------------------------- @@ -18,0 +92,7 @@ +Mon Jun 19 18:22:18 CEST 2006 - hare@suse.de + +- update to svn r606 + - Include local patches + - Fix OCFS2 hangs (#185107, #180773) + +------------------------------------------------------------------- Old: ---- iscsi-iname.c open-iscsi-2.0-707.tar.gz open-iscsi-713.diff open-iscsi-iscsi-iname-Makefile.patch open-iscsi-suse.diff open-iscsi-use-dev-urandom New: ---- iscsi-gen-initiatorname.sh open-iscsi-2.0-754.tar.gz open-iscsi-779.diff open-iscsi-connect-retry open-iscsi-fwparam-mask-typo open-iscsi-fwparam-openprom open-iscsi.sysconfig open-iscsi-umount-all-luns ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.G29583/_old 2007-04-04 20:31:45.000000000 +0200 +++ /var/tmp/diff_new_pack.G29583/_new 2007-04-04 20:31:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package open-iscsi (Version 2.0.713) +# spec file for package open-iscsi (Version 2.0.779) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,26 +11,29 @@ # norootforbuild Name: open-iscsi +BuildRequires: db-devel URL: http://www.open-iscsi.org -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Networking/Other Prereq: %fillup_prereq %insserv_prereq Autoreqprov: on -Version: 2.0.713 +Version: 2.0.779 Release: 1 Provides: linux-iscsi Obsoletes: linux-iscsi -%define iscsi_release 707 +%define iscsi_release 754 Summary: Linux* Open-iSCSI Software Initiator -Source: %{name}-2.0-707.tar.gz +Source: %{name}-2.0-754.tar.gz +Source2: open-iscsi.sysconfig Source3: boot.open-iscsi -Source12: iscsi-iname.c -Patch1: %{name}-713.diff -Patch2: %{name}-suse.diff -Patch3: %{name}-use-dev-urandom -Patch12: %{name}-start-iscsi-after-xen +Source11: iscsi-gen-initiatorname.sh +Patch1: %{name}-779.diff +Patch12: %{name}-connect-retry +Patch13: %{name}-fwparam-mask-typo +Patch14: %{name}-fwparam-openprom +Patch20: %{name}-start-iscsi-after-xen Patch21: %{name}-check-active-sessions-before-delete -Patch22: %{name}-iscsi-iname-Makefile.patch +Patch23: %{name}-umount-all-luns BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,16 +62,27 @@ open-iscsi@googlegroups.com %prep -%setup -n %{name}-2.0-707 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 +%setup -n %{name}-2.0-%{iscsi_release} +%patch1 +# %patch10 +%patch23 -p1 +# %patch11 -p1 %patch12 -p1 -%patch22 -p1 -cp %{S:12} usr/ +%patch13 -p1 +%patch14 -p1 %build +%ifarch %ix86 x86_64 +%define target_arch x86 +%else +%ifarch ppc ppc64 +%define target_arch ppc +%else +%define target_arch none +%endif +%endif %{__make} OPTFLAGS="${RPM_OPT_FLAGS}" -C usr +%{__make} OPTFLAGS="${RPM_OPT_FLAGS} -U_FORTIFY_SOURCE" ARCH=%target_arch -C utils %install [ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} @@ -76,9 +90,10 @@ make DESTDIR=${RPM_BUILD_ROOT} install_etc make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse make DESTDIR=${RPM_BUILD_ROOT} install_doc -install -D -m 755 usr/iscsi-iname ${RPM_BUILD_ROOT}/sbin/iscsi-iname +install -D -m 755 %{S:11} ${RPM_BUILD_ROOT}/sbin/iscsi-gen-initiatorname install -D -m 755 %{S:3} ${RPM_BUILD_ROOT}/etc/init.d/boot.open-iscsi (cd ${RPM_BUILD_ROOT}/sbin; ln -sf /etc/init.d/open-iscsi rcopen-iscsi) +(cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) %clean [ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} @@ -87,25 +102,10 @@ %{fillup_and_insserv -Y boot.open-iscsi} if [ -f /etc/initiatorname.iscsi ] ; then mv /etc/initiatorname.iscsi /etc/iscsi + ln -sf /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi fi -if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then - cat << EOF >> /etc/iscsi/initiatorname.iscsi -## DO NOT EDIT OR REMOVE THIS FILE! -## If you remove this file, the iSCSI daemon will not start. -## If you change the InitiatorName, existing access control lists -## may reject this initiator. The InitiatorName must be unique -## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames. -EOF - ISSUEDATE="1996-04" - INAME=$(/sbin/iscsi-iname -p iqn.$ISSUEDATE.de.suse:01) - printf "InitiatorName=$INAME\n" >>/etc/iscsi/initiatorname.iscsi - chmod 0600 /etc/iscsi/initiatorname.iscsi -fi -if [ -f /var/lib/iscsi/discovery ]; then - mv /var/lib/iscsi/discovery /var/lib/open-iscsi -fi -if [ -f /var/lib/iscsi/node ] ; then - mv /var/lib/iscsi/node /var/lib/open-iscsi +if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then + /sbin/iscsi-gen-initiatorname fi %postun @@ -114,14 +114,49 @@ %files %defattr(-,root,root) %attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf +/etc/iscsid.conf %config /etc/init.d/open-iscsi %config /etc/init.d/boot.open-iscsi -%dir /etc/iscsi /sbin/* +%dir /etc/iscsi %doc COPYING README %doc %{_mandir}/man8/* -%changelog -n open-iscsi +%changelog +* Wed Apr 04 2007 - hare@suse.de +- update to official release 2.0-754 +- update to svn r779 +- Include changes from SLES10 SP1 +* Fri Mar 30 2007 - hare@suse.de +- Include fwparam_ibft program for OpenPROM (#226682) +* Wed Mar 28 2007 - hare@suse.de +- Return status '6' when root on iSCSI is not enabled (#257979) +* Fri Mar 16 2007 - hare@suse.de +- Fix typo in output of fwparam_ibft (#250445) +* Thu Mar 08 2007 - hare@suse.de +- connect() to the daemon might fail on busy machines (#244649) +* Mon Mar 05 2007 - hare@suse.de +- Add /usr/bin/iscsi-dbconvert to convert SLES10 GA + databases to new format (#251298) +* Fri Feb 16 2007 - hare@suse.de +- Fix iscsiadm to print session info correctly (#243203) +* Thu Feb 08 2007 - hare@suse.de +- update to svn r768 + - Update iSNS support (#243203) +- Correct typo in /etc/init.d/boot.open-iscsi (#243203) +* Fri Feb 02 2007 - hare@suse.de +- Umount all luns on shutdown (#223484) +* Wed Jan 31 2007 - hare@suse.de +- Remove the start iSCSI after Xen hack (#231077) +- Fixup /etc/init.d/boot.open-iscsi script (#239819) +* Thu Jan 18 2007 - hare@suse.de +- Fix compat mode to display the record id. +- Add /sbin/iscsi-gen-initiatorname to generate + a default iSCSI initiatorname. +* Mon Jan 15 2007 - hare@suse.de +- Fixup %%post scripts. +* Mon Jan 15 2007 - hare@suse.de +- Reference symlink to /etc/iscsid.conf in rpm. * Fri Oct 20 2006 - hare@suse.de - Update to svn r713 - Use /dev/urandom instead of rand() (#180837) @@ -130,6 +165,10 @@ - Update to official version 2.0-707 * Fri Jul 28 2006 - olh@suse.de - remove unused boot.proc from boot.open-iscsi (#181972) +* Mon Jun 19 2006 - hare@suse.de +- update to svn r606 + - Include local patches + - Fix OCFS2 hangs (#185107, #180773) * Thu Jun 01 2006 - hare@suse.de - Added new startmode 'onboot' for root on iSCSI - Added new init script boot.open-iscsi startup ++++++ boot.open-iscsi ++++++ --- open-iscsi/boot.open-iscsi 2006-10-20 12:57:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/open-iscsi/boot.open-iscsi 2007-03-28 12:23:35.000000000 +0200 @@ -4,7 +4,7 @@ # ### BEGIN INIT INFO # Provides: iscsiboot -# Required-Start: +# Required-Start: boot.proc # Should-Start: # Required-Stop: # Should-Stop: @@ -14,6 +14,7 @@ # ### END INIT INFO +ISCSIADM=/sbin/iscsiadm PID_FILE=/var/run/iscsi.pid CONFIG_FILE=/etc/iscsid.conf DAEMON=/sbin/iscsid @@ -29,10 +30,10 @@ # iscsi_mark_root_nodes() { - TARGETS=$($ISCSIADM -m session 2> /dev/null | sed 's@\[[^:]*:\(.*\)\] .*@\1@g') + TARGETS=$($ISCSIADM -m session 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` - if [ $STARTUP != "onboot" ] ; then + if [ "$STARTUP" != "onboot" ] ; then $ISCSIADM -m node -r $rec -o update -n node.conn[0].startup -v onboot fi done @@ -43,7 +44,7 @@ # We only need to start this for root on iSCSI if ! grep -q iscsi_tcp /proc/modules ; then - rc_failed 7 + rc_failed 6 rc_exit fi ++++++ open-iscsi-2.0-707.tar.gz -> open-iscsi-2.0-754.tar.gz ++++++ ++++ 23558 lines of diff (skipped) ++++++ open-iscsi-713.diff -> open-iscsi-779.diff ++++++ ++++ 10752 lines (skipped) ++++ between open-iscsi/open-iscsi-713.diff ++++ and /mounts/work_src_done/STABLE/open-iscsi/open-iscsi-779.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org