Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:12.1 checked in at 2011-11-05 11:36:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/yast2-iscsi-client (Old) and /work/SRC/openSUSE:12.1/.yast2-iscsi-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-client", Maintainer is "fehr@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1/yast2-iscsi-client/yast2-iscsi-client.changes 2011-10-28 19:12:02.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.yast2-iscsi-client.new/yast2-iscsi-client.changes 2011-11-05 12:18:56.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 3 13:06:10 CET 2011 - fehr@suse.de + +- 2.21.9 +- call discovery with "-t fw" if "-t st" does not provide any + targets (bnc#725833) + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-2.21.8.tar.bz2 New: ---- yast2-iscsi-client-2.21.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.Djvd7v/_old 2011-11-05 12:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Djvd7v/_new 2011-11-05 12:18:59.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-iscsi-client -Version: 2.21.8 +Version: 2.21.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.21.8.tar.bz2 +Source0: yast2-iscsi-client-2.21.9.tar.bz2 Prefix: /usr @@ -47,7 +47,7 @@ client. %prep -%setup -n yast2-iscsi-client-2.21.8 +%setup -n yast2-iscsi-client-2.21.9 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-iscsi-client-2.21.8.tar.bz2 -> yast2-iscsi-client-2.21.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.8/VERSION new/yast2-iscsi-client-2.21.9/VERSION --- old/yast2-iscsi-client-2.21.8/VERSION 2011-10-27 12:18:00.000000000 +0200 +++ new/yast2-iscsi-client-2.21.9/VERSION 2011-11-03 16:53:57.000000000 +0100 @@ -1 +1 @@ -2.21.8 +2.21.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.8/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.21.9/src/IscsiClientLib.ycp --- old/yast2-iscsi-client-2.21.8/src/IscsiClientLib.ycp 2011-10-27 12:48:43.000000000 +0200 +++ new/yast2-iscsi-client-2.21.9/src/IscsiClientLib.ycp 2011-11-03 16:54:24.000000000 +0100 @@ -856,9 +856,9 @@ }); } -global string GetDiscoveryCmd( string ip, string port) +global string GetDiscoveryCmd( string ip, string port, boolean fw) { - y2milestone( "GetDiscoveryCmd ip:%1 port:%2", ip, port); + y2milestone( "GetDiscoveryCmd ip:%1 port:%2 fw:%3", ip, port, fw); string command = "-m discovery -P 1"; if( useISNS() ) command = command + " -t isns"; @@ -868,7 +868,11 @@ y2milestone( "ifs=%1", ifs ); ifs = maplist( string s, ifs, ``("-I "+s)); y2milestone( "ifs=%1", ifs ); - command = command + sformat( " -t st %3 -p %1:%2", ip, port, mergestring(ifs," ")); + string tgt = "st"; + if( fw ) + tgt = "fw"; + command = command + sformat( " -t %4 %3 -p %1:%2", ip, port, + mergestring(ifs," "), tgt); } command = GetAdmCmd(command); y2milestone( "GetDiscoveryCmd %1", command ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-2.21.8/src/widgets.ycp new/yast2-iscsi-client-2.21.9/src/widgets.ycp --- old/yast2-iscsi-client-2.21.8/src/widgets.ycp 2011-10-27 11:45:24.000000000 +0200 +++ new/yast2-iscsi-client-2.21.9/src/widgets.ycp 2011-11-03 16:54:24.000000000 +0100 @@ -472,10 +472,16 @@ //y2internal("auth: %1/%2, %3/%4", user_in, pass_in, user_out, pass_out); bg_finish=false; // ` with authentication - string command = IscsiClientLib::GetDiscoveryCmd(ip,port); + string command = IscsiClientLib::GetDiscoveryCmd(ip,port,false); list<string>trg_list = runInBg( command ); - IscsiClientLib::targets = IscsiClientLib::ScanDiscovered( trg_list ); while(!bg_finish){}; + if( size(trg_list)==0 ) + { + command = IscsiClientLib::GetDiscoveryCmd(ip,port,true); + trg_list = runInBg( command ); + while(!bg_finish){}; + } + IscsiClientLib::targets = IscsiClientLib::ScanDiscovered( trg_list ); // restore old config IscsiClientLib::oldConfig(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org