Merge pull request #35 from gabi2/Code-11-SP4

filter out scope link IPv6 address (Code 11 SP4)
yast · Mar 5, 2015 · 758f973 · 758f973
2 parents 92377ef + e6a101c
commit 758f973
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.13
+2.17.14
diff --git a/package/yast2-iscsi-lio-server.changes b/package/yast2-iscsi-lio-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 24 09:53:45 CET 2015 - gs@suse.de
+
+- 2.17.14
+- filter out Scope:Link IPv6 address (related to fate #314804)
+- add description to spec file
+
 -------------------------------------------------------------------
 Wed Jan 14 10:24:36 CET 2015 - gs@suse.de
 

diff --git a/src/IscsiLioData.ycp b/src/IscsiLioData.ycp
@@ -479,7 +479,9 @@ global list<string> GetIpAddr()
             }
             return(s);
         });
-    ls = filter( string s, ls, ``(substring( s, 0, 4 )!="127." && substring( s, 0, 3 ) != "::1") );
+    ls = filter( string s, ls, ``(substring( s, 0, 4 ) != "127."&&      // lo IPv4
+                                  substring( s, 0, 3 ) != "::1" &&      // lo IPv6
+                                  substring( s, 0, 5 ) != "fe80:") );   // scope link IPv6
     if( size(ls)==0 )
 	ls = add( ls, "" );
     y2milestone( "GetIpAddr ls:%1", ls );

diff --git a/yast2-iscsi-lio-server.spec.in b/yast2-iscsi-lio-server.spec.in
@@ -10,7 +10,7 @@ BuildArchitectures:	noarch
 Summary:	Configuration of iSCSI LIO target
 
 %description
--
+This package contains configuration of iSCSI LIO targets.
 
 @PREP@