let startup-mode unchanged when using 'Add' button for discovery (bnc…

… #886796)
yast · Oct 16, 2014 · 705960b · 705960b
1 parent 0f8b410
commit 705960b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/IscsiClientLib.ycp b/src/IscsiClientLib.ycp
@@ -880,9 +880,9 @@ void CallConfigScript()
 	});
     }
 
-global string GetDiscoveryCmd( string ip, string port, boolean fw)
+global string GetDiscoveryCmd( string ip, string port, boolean fw, boolean only_new)
     {
-    y2milestone( "GetDiscoveryCmd ip:%1 port:%2 fw:%3", ip, port, fw);
+    y2milestone( "GetDiscoveryCmd ip:%1 port:%2 fw:%3 only_new: %4", ip, port, fw, only_new);
     string command = "-m discovery -P 1";
     if( useISNS() )
 	command = command + " -t isns";
@@ -897,6 +897,8 @@ global string GetDiscoveryCmd( string ip, string port, boolean fw)
 	    tgt = "fw";
 	command = command + sformat( " -t %4 %3 -p %1:%2", ip, port, 
 	                             mergestring(ifs," "), tgt);
+        if( only_new )
+            command = command + " -o new";
 	}
     command = GetAdmCmd(command);
     y2milestone( "GetDiscoveryCmd %1", command );

diff --git a/src/dialogs.ycp b/src/dialogs.ycp
@@ -123,7 +123,7 @@ map<string, map <string, any> > widgets = $[
 		"custom_widget"	:
 		 `VBox(
 		  `Table(`id(`targets), `opt(`notify, `immediate),
-			`header(_("Portal Address"), _("Target Name"), _("Connected")),
+			`header(_("Interface"), _("Portal Address"), _("Target Name"), _("Connected")),
 			[]
 			),
 		  `Left(`HBox(

diff --git a/src/widgets.ycp b/src/widgets.ycp
@@ -472,12 +472,21 @@ if (!IscsiClientLib::useISNS())
 //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,false);
+ # Check current_tab (dialogs.rb) here. If it's "client", i.e. the
+ # 'Add' button at 'Connected Targets' is used, create discovery
+ # command with option --new. The start-up mode for already connected
+ # targets won't change then (fate #317874, bnc #886796).
+ boolean option_new = false;
+ if( current_tab=="client" )
+    {
+    option_new = true;
+    }
+ string command = IscsiClientLib::GetDiscoveryCmd(ip,port,false, option_new);
  list<string>trg_list = runInBg( command );
  while(!bg_finish){};
  if( size(trg_list)==0 )
     {
-    command = IscsiClientLib::GetDiscoveryCmd(ip,port,true);
+    command = IscsiClientLib::GetDiscoveryCmd(ip,port,true, option_new);
     trg_list = runInBg( command );
     while(!bg_finish){};
     }