Merge pull request #15 from gabi2/Code-11-SP2

fix detection of persistent portal (bnc#856494)
yast · Jan 23, 2014 · b291661 · b291661
2 parents 860ce97 + f5d8544
commit b291661
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/package/yast2-iscsi-client.changes b/package/yast2-iscsi-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 16 14:11:11 CET 2014 - gs@suse.de
+
+- fix detection of persistent portal (bnc#856494)
+
 -------------------------------------------------------------------
 Wed Mar 21 11:48:21 CET 2012 - fehr@suse.de
 

diff --git a/src/IscsiClientLib.ycp b/src/IscsiClientLib.ycp
@@ -262,7 +262,9 @@ global list<string> ScanDiscovered( list<string> data )
 	    {
 	    if( search(row,"Current Portal:")!=nil )
 		portal = splitstring(row, " ")[2]:"";
-	    else if( search(row,"Persistent Portal:")==nil )
+	    else if( search(row,"Persistent Portal:")!=nil )
+		portal = splitstring(row, " ")[2]:"";
+	    else
 		portal = splitstring(row, " ")[1]:"";
 	    integer pos = search(portal,",");
 	    if( pos != nil )