Hello community,
here is the log from the commit of package open-iscsi for openSUSE:Factory
checked in at 2014-06-05 10:49:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old)
and /work/SRC/openSUSE:Factory/.open-iscsi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2014-05-02
20:52:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes
2014-06-05 10:49:51.000000000 +0200
@@ -1,0 +2,21 @@
+Fri May 30 11:50:36 CEST 2014 - h...@suse.de
+
+- Install ibft-rule-generator (bnc#880336)
+
+-------------------------------------------------------------------
+Wed May 28 15:26:29 CEST 2014 - h...@suse.de
+
+- iscsi.service: do not logout from all sessions during shutdown
+ (bnc#880338)
+- iscsid.service: Fixup dependencies (bnc#880338)
+
+-------------------------------------------------------------------
+Fri May 2 15:07:14 2014 +0200 - h...@suse.de
+
+- iscsi_offload: do not print error messages for be2iscsi
+
+ be2iscsi HBAs display the firmware settings in
+ /sys/firmware/iscsi_boot1 and only provide a subset
+ of the iBFT settings (bnc#876137)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-iscsi.spec ++++++
--- /var/tmp/diff_new_pack.OivHZv/_old 2014-06-05 10:49:52.000000000 +0200
+++ /var/tmp/diff_new_pack.OivHZv/_new 2014-06-05 10:49:52.000000000 +0200
@@ -236,6 +236,7 @@
%{_unitdir}/iscsid.service
%{_unitdir}/iscsid.socket
%{_unitdir}/iscsi.service
+/usr/lib/systemd/system-generators/ibft-rule-generator
%else
%config /etc/init.d/iscsid
%config /etc/init.d/boot.iscsid-early
++++++ open-iscsi-Factory-latest.diff.bz2 ++++++
--- /var/tmp/diff_new_pack.OivHZv/_old 2014-06-05 10:49:52.000000000 +0200
+++ /var/tmp/diff_new_pack.OivHZv/_new 2014-06-05 10:49:52.000000000 +0200
@@ -12,14 +12,14 @@
of this license document, but changing it is not allowed.
diff --git a/Makefile b/Makefile
-index 36ebd2d1be13..961048a1d62e 100644
+index 36ebd2d1be13..cf813d51f451 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,11 @@ mandir = $(prefix)/share/man
etcdir = /etc
initddir = $(etcdir)/init.d
mkinitrd = $(exec_prefix)/lib/mkinitrd/scripts
-+systemddir = $(prefix)/lib/systemd/system
++systemddir = $(prefix)/lib/systemd
-MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8
-PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname
@@ -98,23 +98,26 @@
$(INSTALL) -d $(DESTDIR)$(mkinitrd)
$(INSTALL) -m 755 etc/mkinitrd/mkinitrd-boot.sh \
$(DESTDIR)$(mkinitrd)/boot-iscsi.sh
-@@ -120,12 +133,26 @@ install_initd_debian:
+@@ -120,12 +133,29 @@ install_initd_debian:
$(INSTALL) -m 755 etc/initd/initd.debian \
$(DESTDIR)$(initddir)/open-iscsi
+# install systemd service files for openSUSE
+install_service_suse:
-+ $(INSTALL) -d $(DESTDIR)$(systemddir)
++ $(INSTALL) -d $(DESTDIR)$(systemddir)/system
+ $(INSTALL) -m 644 etc/systemd/iscsid.service \
-+ $(DESTDIR)$(systemddir)
++ $(DESTDIR)$(systemddir)/system
+ $(INSTALL) -m 644 etc/systemd/iscsid.socket \
-+ $(DESTDIR)$(systemddir)
++ $(DESTDIR)$(systemddir)/system
+ $(INSTALL) -m 644 etc/systemd/iscsi.service \
-+ $(DESTDIR)$(systemddir)
++ $(DESTDIR)$(systemddir)/system
+ $(INSTALL) -m 644 etc/systemd/iscsiuio.service \
-+ $(DESTDIR)$(systemddir)
++ $(DESTDIR)$(systemddir)/system
+ $(INSTALL) -m 644 etc/systemd/iscsiuio.socket \
-+ $(DESTDIR)$(systemddir)
++ $(DESTDIR)$(systemddir)/system
++ $(INSTALL) -d $(DESTDIR)$(systemddir)/system-generators
++ $(INSTALL) -m 755 utils/ibft-rule-generator \
++ $(DESTDIR)$(systemddir)/system-generators
+
install_iface: $(IFACEFILES)
$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi/ifaces
@@ -126,7 +129,7 @@
$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
fi
-@@ -138,11 +165,11 @@ install_kernel:
+@@ -138,11 +168,11 @@ install_kernel:
$(MAKE) -C kernel install_kernel
install_iname:
@@ -801,7 +804,7 @@
[ "$iscsiuio_pid" ] && kill -TERM $iscsiuio_pid
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
new file mode 100644
-index 000000000000..54fd8159ad56
+index 000000000000..0239ef6936a5
--- /dev/null
+++ b/etc/systemd/iscsi.service
@@ -0,0 +1,15 @@
@@ -814,7 +817,7 @@
+[Service]
+Type=oneshot
+ExecStart=/sbin/iscsiadm -m node --loginall=automatic
-+ExecStop=/sbin/iscsiadm -m session --logout
++ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
+SuccessExitStatus=21
+RemainAfterExit=true
+
@@ -822,19 +825,20 @@
+WantedBy=remote-fs.target
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
new file mode 100644
-index 000000000000..1af1c6fce0cb
+index 000000000000..bddae78106b7
--- /dev/null
+++ b/etc/systemd/iscsid.service
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,15 @@
+[Unit]
+Description=Open-iSCSI
+Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
-+After=network.target network-online.target iscsiuio.service tgtd.service
targetcli.service
++DefaultDependencies=no
++After=network.target iscsiuio.service
++Before=remote-fs-pre.target
+
+[Service]
-+Type=forking
-+PIDFile=/var/run/iscsid.pid
-+ExecStart=/sbin/iscsid
++Type=simple
++ExecStart=/sbin/iscsid -f
+ExecStop=/sbin/iscsiadm -k 0 2
+
+[Install]
@@ -18681,11 +18685,32 @@
echo "$RPM src rpm copied to $DESTDIR"
diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes
-index 2e21afc6bc7b..1fb50c4705a6 100644
+index 2e21afc6bc7b..a3b3dbfede0b 100644
--- a/rpm/open-iscsi.changes
+++ b/rpm/open-iscsi.changes
-@@ -1,4 +1,275 @@
+@@ -1,4 +1,296 @@
-------------------------------------------------------------------
++Fri May 30 11:50:36 CEST 2014 - h...@suse.de
++
++- Install ibft-rule-generator (bnc#880336)
++
++-------------------------------------------------------------------
++Wed May 28 15:26:29 CEST 2014 - h...@suse.de
++
++- iscsi.service: do not logout from all sessions during shutdown
++ (bnc#880338)
++- iscsid.service: Fixup dependencies (bnc#880338)
++
++-------------------------------------------------------------------
++Fri May 2 15:07:14 2014 +0200 - h...@suse.de
++
++- iscsi_offload: do not print error messages for be2iscsi
++
++ be2iscsi HBAs display the firmware settings in
++ /sys/firmware/iscsi_boot1 and only provide a subset
++ of the iBFT settings (bnc#876137)
++
++-------------------------------------------------------------------
+Mon Apr 28 11:00:03 PDT 2014 - ldun...@suse.com
+
+- Added two not-yet-upstream patches for iscsiuio/systemd activation
@@ -18960,7 +18985,7 @@
Fri Dec 9 15:09:01 CET 2011 - h...@suse.de
- iscsiadm: Return correct error when login fails (bnc#715071)
-@@ -40,6 +311,11 @@ Fri Nov 4 09:15:52 CET 2011 - h...@suse.de
+@@ -40,6 +332,11 @@ Fri Nov 4 09:15:52 CET 2011 - h...@suse.de
- Stop iscsiuio when run inside initrd (bnc#728095)
-------------------------------------------------------------------
@@ -18972,7 +18997,7 @@
Mon Oct 24 09:13:19 CEST 2011 - h...@suse.de
- Update iscsiuio to 0.7.0.14f (bnc#687392)
-@@ -101,6 +377,11 @@ Tue Jun 21 15:09:46 CEST 2011 - h...@suse.de
+@@ -101,6 +398,11 @@ Tue Jun 21 15:09:46 CEST 2011 - h...@suse.de
- Include scripts for automated build
-------------------------------------------------------------------
@@ -18984,7 +19009,7 @@
Wed Feb 2 11:32:12 CET 2011 - mweckbec...@suse.de
- Fix the following issues:
-@@ -224,6 +505,11 @@ Wed Nov 18 10:33:27 CET 2009 - h...@suse.de
+@@ -224,6 +526,11 @@ Wed Nov 18 10:33:27 CET 2009 - h...@suse.de
- Read initiatorname correctly from sysfs (bnc#541882)
-------------------------------------------------------------------
@@ -18996,7 +19021,7 @@
Wed Aug 19 12:58:13 CEST 2009 - h...@suse.de
- Synchronize startup settings (bnc#514273)
-@@ -231,11 +517,24 @@ Wed Aug 19 12:58:13 CEST 2009 - h...@suse.de
+@@ -231,11 +538,24 @@ Wed Aug 19 12:58:13 CEST 2009 - h...@suse.de
- Do not use temp file in iscsi_discovery (bnc#528711)
-------------------------------------------------------------------
@@ -19022,7 +19047,7 @@
- Fix relogin retry handling (bnc#466846)
diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec
-index 27ab050554f1..fb1438dab429 100644
+index 27ab050554f1..60288f0f0a0d 100644
--- a/rpm/open-iscsi.spec
+++ b/rpm/open-iscsi.spec
@@ -1,7 +1,7 @@
@@ -19139,7 +19164,7 @@
cd iscsiuio
touch NEWS
touch AUTHORS
-@@ -80,48 +125,167 @@ make CFLAGS="${RPM_OPT_FLAGS}"
+@@ -80,48 +125,168 @@ make CFLAGS="${RPM_OPT_FLAGS}"
%install
make DESTDIR=${RPM_BUILD_ROOT} install_user
@@ -19265,6 +19290,7 @@
+%{_unitdir}/iscsid.service
+%{_unitdir}/iscsid.socket
+%{_unitdir}/iscsi.service
++/usr/lib/systemd/system-generators/ibft-rule-generator
+%else
+%config /etc/init.d/iscsid
+%config /etc/init.d/boot.iscsid-early
@@ -26788,6 +26814,42 @@
/*
* We can live without the rest of they do not exist. If we
* failed to get them we will figure it out when we login.
+diff --git a/utils/ibft-rule-generator b/utils/ibft-rule-generator
+new file mode 100644
+index 000000000000..079e35be9e5c
+--- /dev/null
++++ b/utils/ibft-rule-generator
+@@ -0,0 +1,30 @@
++#!/bin/bash
++#
++# Systemd rule generator for ibft interfaces
++#
++# When booted with 'ip=ibft' dracut will rename the
++# interface to 'ibft*'. After systemd has started
++# it'll try to rename the interface yet again with
++# a persistent name.
++# But as the ibft interface is already renamed _and_
++# in use, the second renaming will fail and udev
++# will complain.
++# So add a dummy rule which signals udev the correct name
++#
++# Interface renaming happes at 80-net-setup-link.rules,
++# so we need to hook in before that.
++#
++IBFT_RULES=/run/udev/rules.d/79-ibft.rules
++
++if [ -d /run/udev/rules.d ] ; then
++ rm $IBFT_RULES 2> /dev/null
++else
++ mkdir -p /run/udev/rules.d
++fi
++
++for d in /sys/firmware/ibft/ethernet* ; do
++ [ -d "$d" ] || break
++ num="${d##*/ethernet}"
++ read mac < $d/mac
++ printf 'SUBSYSTEM=="net", KERNEL=="ibft*", ACTION=="add", DRIVERS=="?*",
ATTR{address}=="%s", ATTR{type}=="1", NAME="ibft%s"\n' "$mac" "$num" >>
$IBFT_RULES
++done
diff --git a/utils/iscsi_discovery b/utils/iscsi_discovery
index d07ecc25760a..1907046a7f2e 100755
--- a/utils/iscsi_discovery
@@ -26803,6 +26865,82 @@
#
# Author: Dan Bar Dov <d...@voltaire.com>
+diff --git a/utils/iscsi_offload b/utils/iscsi_offload
+index 950825d4a5cc..38eec08394dc 100644
+--- a/utils/iscsi_offload
++++ b/utils/iscsi_offload
+@@ -217,8 +217,11 @@ if iscsiadm -m iface -I $ioe_iface > /dev/null 2>&1 ; then
+ if [ "$ipaddr" == "<empty>" ] ; then
+ ipaddr=
+ fi
++elif [ "$mod" = "be2iscsi" ] ; then
++ ioe_mac=$mac
++ ioe_mod=$mod
+ else
+- iscsiadm -m iface -I $ioe_iface --op=new
++ iscsiadm -m iface -I $ioe_iface --op=new 2> /dev/null
+ ioe_mac=
+ ioe_mod=
+ ipaddr=
+@@ -245,29 +248,39 @@ elif [ "$ioe_mod" != "$mod" ] ; then
+ fi
+
+ # Check iBFT setting
+-if [ -d /sys/firmware/ibft ] ; then
+- for if in /sys/firmware/ibft/ethernet* ; do
++for d in /sys/firmware/* ; do
++ [ -d $d ] || continue
++ [ -d $d/ethernet0 ] || continue
++ iboot_dir=$d
++done
++if [ -n "$iboot_dir" ] && [ -d "$iboot_dir" ] ; then
++ for if in ${iboot_dir}/ethernet* ; do
+ read ibft_mac < $if/mac
+ [ "$ibft_mac" = "$mac" ] || continue
+- read ibft_origin < $if/origin
++ ibft_origin=0
++ [ -f ${if}/origin ] && read ibft_origin < $if/origin
+ if [ "$ibft_origin" -eq 1 ] ; then
+- ibft_mode=static
++ ibft_mode="static"
+ elif [ "$ibft_origin" -eq 3 ] ; then
+- ibft_mode=dhcp
++ ibft_mode="dhcp"
++ else
++ ibft_mode="unknown"
+ fi
+- read ibft_dhcp < $if/dhcp
+- if [ "$ibft_dhcp" -a "$ibft_mode" != "dhcp" ] ; then
++ [ -f $if/dhcp ] && read ibft_dhcp < $if/dhcp
++ if [ -n "$ibft_dhcp" -a "$ibft_mode" != "dhcp" ] ; then
+ ibft_mode=dhcp
+ fi
+ if [ "$ibft_mode" = "dhcp" ] ; then
+ ibft_ipaddr="0.0.0.0"
+- else
+- read ibft_ipaddr < $if/ip-addr
+- read ibft_gateway < $if/gateway
+- read ibft_mask < $if/subnet-mask
++ break
+ fi
++ [ -f $if/ip-addr ] && read ibft_ipaddr < $if/ip-addr
++ [ -f $if/gateway ] && read ibft_gateway < $if/gateway
++ [ -f $if/subnet-mask ] && read ibft_mask < $if/subnet-mask
++ break
+ done
+ fi
++
+ if [ -z "$optaddr" ] && [ "$ibft_ipaddr" ] ; then
+ optaddr=$ibft_ipaddr
+ fi
+@@ -297,7 +310,6 @@ elif [ "$mode" = "static" ] && [ "$ipaddr" = "$optaddr" ]
; then
+ fi
+
+ if [ "$mod" = "be2iscsi" ] ; then
+- echo "Cannot configure $mod, please use the BIOS setup"
+ exit 4
+ fi
+
diff --git a/utils/open-isns/Makefile.in b/utils/open-isns/Makefile.in
index a27199cad294..54cb75b04ba1 100644
--- a/utils/open-isns/Makefile.in
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
