Mailinglist Archive: yast-commit (883 mails)

< Previous Next >
[yast-commit] r57902 - in /branches/SuSE-Code-11-Branch/instserver: package/yast2-instserver.changes src/Instserver.ycp
  • From: lslezak@xxxxxxxxxxxxxxxx
  • Date: Tue, 07 Jul 2009 12:50:57 -0000
  • Message-id: <E1MOA8P-0001XF-6A@xxxxxxxxxxxxxxxx>
Author: lslezak
Date: Tue Jul 7 14:50:56 2009
New Revision: 57902

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

Modified:
branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes
branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp

Modified:
branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes?rev=57902&r1=57901&r2=57902&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes
(original)
+++ branches/SuSE-Code-11-Branch/instserver/package/yast2-instserver.changes
Tue Jul 7 14:50:56 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Mar 18 09:05:43 CET 2009 - lslezak@xxxxxxx
+
+- write correct IP address to SLP config file when there is no eth0
+ device (bnc#475676)
+
+-------------------------------------------------------------------
Fri Dec 19 12:57:33 CET 2008 - lslezak@xxxxxxx

- do not configure vsftpd in xinetd mode if it's set to standalone

Modified: branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp?rev=57902&r1=57901&r2=57902&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp (original)
+++ branches/SuSE-Code-11-Branch/instserver/src/Instserver.ycp Tue Jul 7
14:50:56 2009
@@ -546,8 +546,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

< Previous Next >
This Thread
  • No further messages