Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-iscsi-client -> sle12 ## BNC# 884761 : "Cannot change iSCSI initiatorname during installation" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client/yast2-iscsi-client.changes 2014-06-13 15:01:02.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-iscsi-client/yast2-iscsi-client.changes 2014-07-03 11:54:10.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jul 3 11:04:01 CEST 2014 - gs@suse.de + +- convert result of command call correctly (related to bnc #884761) +- 3.1.14 + +------------------------------------------------------------------- +Wed Jul 2 13:21:29 CEST 2014 - gs@suse.de + +- start and restart daemon 'iscsid' manually during installation + (bnc #884761) +- 3.1.13 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-iscsi-client - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client (Old) and /mounts/work_src_done/SLE12/yast2-iscsi-client (BS:build ID:40376 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-client", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-iscsi-client-3.1.12.tar.bz2 New: ---- yast2-iscsi-client-3.1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.VsCh1C/_old 2014-07-03 18:02:53.000000000 +0200 +++ /var/tmp/diff_new_pack.VsCh1C/_new 2014-07-03 18:02:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.12 +Version: 3.1.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-iscsi-client-3.1.12.tar.bz2 -> yast2-iscsi-client-3.1.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.12/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.14/package/yast2-iscsi-client.changes --- old/yast2-iscsi-client-3.1.12/package/yast2-iscsi-client.changes 2014-06-13 07:22:51.000000000 +0200 +++ new/yast2-iscsi-client-3.1.14/package/yast2-iscsi-client.changes 2014-07-03 11:50:39.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Jul 3 11:04:01 CEST 2014 - gs@suse.de + +- convert result of command call correctly (related to bnc #884761) +- 3.1.14 + +------------------------------------------------------------------- +Wed Jul 2 13:21:29 CEST 2014 - gs@suse.de + +- start and restart daemon 'iscsid' manually during installation + (bnc #884761) +- 3.1.13 + +------------------------------------------------------------------- Wed Jun 11 14:50:01 CEST 2014 - gs@suse.de - allow AutoYaST installation on iSCSI disks with BIOS boot support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.12/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.14/package/yast2-iscsi-client.spec --- old/yast2-iscsi-client-3.1.12/package/yast2-iscsi-client.spec 2014-06-13 07:22:51.000000000 +0200 +++ new/yast2-iscsi-client-3.1.14/package/yast2-iscsi-client.spec 2014-07-03 11:50:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.12 +Version: 3.1.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.12/src/clients/inst_iscsi-client.rb new/yast2-iscsi-client-3.1.14/src/clients/inst_iscsi-client.rb --- old/yast2-iscsi-client-3.1.12/src/clients/inst_iscsi-client.rb 2014-06-13 07:22:51.000000000 +0200 +++ new/yast2-iscsi-client-3.1.14/src/clients/inst_iscsi-client.rb 2014-07-03 11:50:39.000000000 +0200 @@ -56,7 +56,13 @@ # main ui function @ret = nil - Builtins.y2milestone("start iscsid") + Builtins.y2milestone("Loading module %1", "iscsi_tcp") + ModuleLoading.Load("iscsi_tcp", "", "", "", false, true) + + # start iscsid daemon and service 'iscsiuio' + Builtins.y2milestone("start service iscsiuio and daemon iscsid") + IscsiClientLib.start_services_initial + SCR.Execute( path(".target.bash"), "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi" @@ -65,14 +71,9 @@ #WFM::Execute (.local.bash,"test -d /etc/iscsi/ && /bin/cp -a /etc/iscsi/* " + String::Quote(Installation::destdir) + "/etc/iscsi/"); IscsiClientLib.checkInitiatorName - IscsiClientLib.getiBFT - Builtins.y2milestone("Loading module %1", "iscsi_tcp") - ModuleLoading.Load("iscsi_tcp", "", "", "", false, true) IscsiClientLib.LoadOffloadModules - # start iscsid daemon and service 'iscsiuio' - IscsiClientLib.startIScsid # try auto login to target auto_login = IscsiClientLib.autoLogOn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.12/src/clients/iscsi-client_auto.rb new/yast2-iscsi-client-3.1.14/src/clients/iscsi-client_auto.rb --- old/yast2-iscsi-client-3.1.12/src/clients/iscsi-client_auto.rb 2014-06-13 07:22:51.000000000 +0200 +++ new/yast2-iscsi-client-3.1.14/src/clients/iscsi-client_auto.rb 2014-07-03 11:50:39.000000000 +0200 @@ -104,7 +104,7 @@ IscsiClient.write_only = true ModuleLoading.Load("iscsi_tcp", "", "", "", false, true) IscsiClientLib.autoyastPrepare - IscsiClientLib.startIScsid + IscsiClientLib.start_services_initial @ret = IscsiClient.Write Progress.set(@progress_orig) else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.12/src/include/iscsi-client/widgets.rb new/yast2-iscsi-client-3.1.14/src/include/iscsi-client/widgets.rb --- old/yast2-iscsi-client-3.1.12/src/include/iscsi-client/widgets.rb 2014-06-13 07:22:51.000000000 +0200 +++ new/yast2-iscsi-client-3.1.14/src/include/iscsi-client/widgets.rb 2014-07-03 11:50:39.000000000 +0200 @@ -446,10 +446,9 @@ Convert.to_string(UI.QueryWidget(:initiator_name, :Value)) ) if Stage.initial - SCR.Execute(path(".target.bash"), "killproc /sbin/iscsid") - IscsiClientLib.startIScsid + IscsiClientLib.restart_iscsid_initial else - SCR.Execute(path(".target.bash"), "rciscsid restart") + Service.Restart("iscsid") end Builtins.y2milestone( "write initiatorname %1", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.12/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.14/src/modules/IscsiClientLib.rb --- old/yast2-iscsi-client-3.1.12/src/modules/IscsiClientLib.rb 2014-06-13 07:22:51.000000000 +0200 +++ new/yast2-iscsi-client-3.1.14/src/modules/IscsiClientLib.rb 2014-07-03 11:50:39.000000000 +0200 @@ -491,9 +491,22 @@ deep_copy(@discovered) end + def start_services_initial + # start service 'iscsiuio' and daemon 'iscsid' + Service.Start("iscsiuio") + start_iscsid_initial + end + + def restart_iscsid_initial + retcode = Convert.to_integer(SCR.Execute(path(".target.bash"), "pgrep iscsid")) + if retcode == 0 + Service.Stop("iscsid") + end + start_iscsid_initial + end - def startIScsid - SCR.Execute(path(".target.bash"), "pgrep iscsid || iscsid") + def start_iscsid_initial + SCR.Execute(path(".target.bash"), "pgrep iscsid || /sbin/iscsid") Builtins.foreach([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]) do |i| Builtins.sleep(1 * 1000) cmd = Convert.convert( @@ -511,8 +524,6 @@ raise Break end end - # start service 'iscsiuio' - Service.Start("iscsiuio") nil end @@ -576,7 +587,11 @@ end # reload service when initiatorname is changed to re-read new value (bnc#482429) # SLES12: restart the daemon (reload not supported in iscsid.service) - Service.Restart("iscsid") + if Stage.initial + restart_iscsid_initial + else + Service.Restart("iscsid") + end ret end @@ -930,7 +945,7 @@ if Ops.greater_than(Builtins.size(getiBFT), 0) result = Convert.to_map(SCR.Execute(path(".target.bash_output"), GetAdmCmd("-m fw -l"))) - if result["exit"] || 255 != 0 + if result["exit"] != 0 ret = false end log.info "Autologin into iBFT : #{result}" @@ -1006,7 +1021,7 @@ if Stage.initial ModuleLoading.Load("iscsi_tcp", "", "", "", false, true) # start daemon manually (systemd not available in inst-sys) - startIScsid + start_services_initial else # find sockets (only in installed system) # throw exception if socket not found @@ -1075,7 +1090,7 @@ checkInitiatorName end # start daemon before - startIScsid + start_services_initial nil end @@ -1644,7 +1659,7 @@ publish :function => :saveConfig, :type => "void (string, string, string, string)" publish :function => :ScanDiscovered, :type => "list <string> (list <string>)" publish :function => :getDiscovered, :type => "list <string> ()" - publish :function => :startIScsid, :type => "void ()" + publish :function => :start_services_initial, :type => "void ()" publish :function => :readSessions, :type => "boolean ()" publish :function => :writeInitiatorName, :type => "boolean (string)" publish :function => :checkInitiatorName, :type => "boolean ()" continue with "q"... Checked in at Thu Jul 3 18:03:00 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org