Mailinglist Archive: yast-commit (518 mails)

[lslezak@xxxxxxxxxxxxxxxx]

Author: lslezak
Date: Wed Apr  8 15:19:09 2009
New Revision: 56700

URL: http://svn.opensuse.org/viewcvs/yast?rev=56700&view=rev
Log:
- write correct IP address to SLP config file when there is no eth0
  device (bnc#475676)

Modified:
    branches/SuSE-SLE-10-SP3-Branch/instserver/package/yast2-instserver.changes
    branches/SuSE-SLE-10-SP3-Branch/instserver/src/Instserver.ycp

Modified: 
branches/SuSE-SLE-10-SP3-Branch/instserver/package/yast2-instserver.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instserver/package/yast2-instserver.changes?rev=56700&r1=56699&r2=56700&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/instserver/package/yast2-instserver.changes 
(original)
+++ branches/SuSE-SLE-10-SP3-Branch/instserver/package/yast2-instserver.changes 
Wed Apr  8 15:19:09 2009
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Apr  8 15:18:39 CEST 2009 - lslezak@xxxxxxx
+
+- write correct IP address to SLP config file when there is no eth0
+  device (bnc#475676)
+
+-------------------------------------------------------------------
 Thu Mar 13 07:20:45 CET 2008 - lslezak@xxxxxxx
 
 - added missing translation mark (bnc#366082)

Modified: branches/SuSE-SLE-10-SP3-Branch/instserver/src/Instserver.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instserver/src/Instserver.ycp?rev=56700&r1=56699&r2=56700&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/instserver/src/Instserver.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/instserver/src/Instserver.ycp Wed Apr  8 
15:19:09 2009
@@ -496,8 +496,16 @@
 global string GetIPAddr()
 {
     list<map> ifconfig =(list<map>)SCR::Read(.run.ifconfig);
-    ifconfig = filter(map iface, ifconfig, ``( iface["name"]:"" == "eth0"));
-    integer ip = ifconfig[0,"value", "inet", "addr"]:0;
+    list<map> ifc = filter(map iface, ifconfig, ``( iface["name"]:"" == 
"eth0"));
+    integer ip = ifc[0,"value", "inet", "addr"]:0;
+    if (ip == 0)
+    {
+       ifc = filter(map iface, ifconfig, ``( iface["name"]:"" != "lo" && 
!issubstring(iface["name"]:"", "dummy") && iface["value", "inet", "addr"]:0 != 
0));
+       if (ifc != nil) 
+       {
+               ip = ifc[0,"value", "inet", "addr"]:0;
+       }
+    }
 
     return (IP::ToString(ip));
 }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx