Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2019-03-04 09:15:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old) and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client" Mon Mar 4 09:15:52 2019 rev:121 rq:680526 version:4.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes 2018-12-31 09:44:54.478289391 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new.28833/yast2-iscsi-client.changes 2019-03-04 09:15:54.656649182 +0100 @@ -1,0 +2,6 @@ +Fri Mar 1 13:36:35 UTC 2019 - [email protected] + +- fix iBFT handling (bsc#1119698) +- 4.1.5 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-4.1.4.tar.bz2 New: ---- yast2-iscsi-client-4.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.LfPwq8/_old 2019-03-04 09:15:55.204649083 +0100 +++ /var/tmp/diff_new_pack.LfPwq8/_new 2019-03-04 09:15:55.208649082 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-iscsi-client # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 4.1.4 +Version: 4.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-iscsi-client-4.1.4.tar.bz2 -> yast2-iscsi-client-4.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-4.1.4/package/yast2-iscsi-client.changes new/yast2-iscsi-client-4.1.5/package/yast2-iscsi-client.changes --- old/yast2-iscsi-client-4.1.4/package/yast2-iscsi-client.changes 2018-12-20 10:30:23.000000000 +0100 +++ new/yast2-iscsi-client-4.1.5/package/yast2-iscsi-client.changes 2019-03-01 15:47:03.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 1 13:36:35 UTC 2019 - [email protected] + +- fix iBFT handling (bsc#1119698) +- 4.1.5 + +------------------------------------------------------------------- Thu Dec 13 16:42:21 UTC 2018 - [email protected] - always use absolute path to binaries (bsc#1118291) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-4.1.4/package/yast2-iscsi-client.spec new/yast2-iscsi-client-4.1.5/package/yast2-iscsi-client.spec --- old/yast2-iscsi-client-4.1.4/package/yast2-iscsi-client.spec 2018-12-20 10:30:23.000000000 +0100 +++ new/yast2-iscsi-client-4.1.5/package/yast2-iscsi-client.spec 2019-03-01 15:47:03.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 4.1.4 +Version: 4.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-4.1.4/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-4.1.5/src/modules/IscsiClientLib.rb --- old/yast2-iscsi-client-4.1.4/src/modules/IscsiClientLib.rb 2018-12-20 10:30:23.000000000 +0100 +++ new/yast2-iscsi-client-4.1.5/src/modules/IscsiClientLib.rb 2019-03-01 15:47:03.000000000 +0100 @@ -220,7 +220,7 @@ key, val = row.split("=") key = key.to_s.strip - retval[key] = val.to_s.strip if !key.empty? + retval[key] = val.to_s.strip if !key.empty? && !key.match?(/^#/) end retval @@ -751,7 +751,15 @@ # @return [Bool] nodes are equal? # def equalNodes?(n1, n2) - return false if n1.empty? + return false if n1.empty? || n2.empty? + + # we're going to modify one key... + n1 = n1.dup + n2 = n2.dup + + # if unset, use default from /etc/iscsi/initiatorname.iscsi + n1["iface.initiatorname"] = @initiatorname if n1["iface.initiatorname"] == "<empty>" + n2["iface.initiatorname"] = @initiatorname if n2["iface.initiatorname"] == "<empty>" keys = [ "iface.transport_name", @@ -946,6 +954,8 @@ result = SCR.Execute(path(".target.bash_output"), GetAdmCmd("-m fw -l")) ret = false if result["exit"] != 0 log.info "Autologin into iBFT : #{result}" + result = SCR.Execute(path(".target.bash_output"), GetAdmCmd("-m discovery -t fw")) + log.info "iBFT discovery: #{result}" end ret end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-4.1.4/test/getiBFT_spec.rb new/yast2-iscsi-client-4.1.5/test/getiBFT_spec.rb --- old/yast2-iscsi-client-4.1.4/test/getiBFT_spec.rb 2018-12-20 10:30:23.000000000 +0100 +++ new/yast2-iscsi-client-4.1.5/test/getiBFT_spec.rb 2019-03-01 15:47:03.000000000 +0100 @@ -27,16 +27,14 @@ ibft_data = @iscsilib.getiBFT expect(ibft_data).to eq( - "# BEGIN RECORD 2.0-872" => "", - "# END RECORD" => "", - "iface.bootproto" => "STATIC", - "iface.hwaddress" => "00:00:c9:b1:bc:7f", - "iface.initiatorname" => "iqn.2011-05.com.emulex:eraptorrfshoneport1", - "iface.transport_name" => "tcp", - "iface.ipaddress" => "2620:0113:80c0:8000:000c:0000:0000:04dc", - "node.conn[0].address" => "172.0.21.6", - "node.conn[0].port" => "3260", - "node.name" => "iqn.1986-03.com.ibm:sn.135061874" + "iface.bootproto" => "STATIC", + "iface.hwaddress" => "00:00:c9:b1:bc:7f", + "iface.initiatorname" => "iqn.2011-05.com.emulex:eraptorrfshoneport1", + "iface.transport_name" => "tcp", + "iface.ipaddress" => "2620:0113:80c0:8000:000c:0000:0000:04dc", + "node.conn[0].address" => "172.0.21.6", + "node.conn[0].port" => "3260", + "node.name" => "iqn.1986-03.com.ibm:sn.135061874" ) end end
