Mailinglist Archive: yast-commit (322 mails)

[fehr@xxxxxxxxxxxxxxxxx]

Author: fehr
Date: Thu Nov  3 17:32:05 2011
New Revision: 66691

URL: http://svn.opensuse.org/viewcvs/yast?rev=66691&view=rev
Log:
+- 2.21.9
+- call discovery with "-t fw" if "-t st" does not provide any targets 
(bnc#725833)


Modified:
    trunk/iscsi-client/VERSION
    trunk/iscsi-client/package/yast2-iscsi-client.changes
    trunk/iscsi-client/src/IscsiClientLib.ycp
    trunk/iscsi-client/src/widgets.ycp

Modified: trunk/iscsi-client/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=66691&r1=66690&r2=66691&view=diff
==============================================================================
--- trunk/iscsi-client/VERSION (original)
+++ trunk/iscsi-client/VERSION Thu Nov  3 17:32:05 2011
@@ -1 +1 @@
-2.21.8
+2.21.9

Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=66691&r1=66690&r2=66691&view=diff
==============================================================================
--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu Nov  3 17:32:05 
2011
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Nov  3 13:06:10 CET 2011  - fehr@xxxxxxx
+
+- 2.21.9
+- call discovery with "-t fw" if "-t st" does not provide any
+  targets (bnc#725833)
+
+-------------------------------------------------------------------
 Thu Oct 27 11:41:58 CEST 2011 - fehr@xxxxxxx
 
 - 2.21.8

Modified: trunk/iscsi-client/src/IscsiClientLib.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=66691&r1=66690&r2=66691&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClientLib.ycp (original)
+++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Nov  3 17:32:05 2011
@@ -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 );

Modified: trunk/iscsi-client/src/widgets.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=66691&r1=66690&r2=66691&view=diff
==============================================================================
--- trunk/iscsi-client/src/widgets.ycp (original)
+++ trunk/iscsi-client/src/widgets.ycp Thu Nov  3 17:32:05 2011
@@ -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: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx