Author: mzugec
Date: Fri Jul 25 16:01:50 2008
New Revision: 49418
URL: http://svn.opensuse.org/viewcvs/yast?rev=49418&view=rev
Log:
support for tunnel devices in NetworkInterfaces (FaTE#302184)
Modified:
trunk/yast2/VERSION
trunk/yast2/library/network/src/NetworkInterfaces.ycp
trunk/yast2/package/yast2.changes
Modified: trunk/yast2/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/yast2/VERSION (original)
+++ trunk/yast2/VERSION Fri Jul 25 16:01:50 2008
@@ -1 +1 @@
-2.17.8
+2.17.9
Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original)
+++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Fri Jul 25 16:01:50 2008
@@ -83,7 +83,7 @@
* Predefined network card regular expressions
*/
global map CardRegex = $[
- "netcard" : "arc|ath|bnep|ci|ctc|dummy|bond|escon|eth|fddi|ficon|hsi|qeth|lcs|iucv|myri|tr|usb|wlan|xp|vlan|br",
+ "netcard" : "arc|ath|bnep|ci|ctc|dummy|bond|escon|eth|fddi|ficon|hsi|qeth|lcs|iucv|myri|tr|usb|wlan|xp|vlan|br|tun|tap",
"modem" : "ppp|modem",
"isdn" : "isdn|ippp",
"dsl" : "dsl",
@@ -185,6 +185,7 @@
foreach(string dev_type,map confs, Devices, {
if (haskey(confs, dev)){
string int_type = confs[dev, "INTERFACETYPE"]:"";
+ if (size(confs[dev, "TUNNEL"]:"")>0) int_type = confs[dev, "TUNNEL"]:"";
if(size(int_type)>0) type = int_type;
}
});
@@ -831,7 +832,7 @@
* for this hardware
*/
global list<string> GetDeviceTypes(){
- list<string> dev_types = ["eth", "tr", "vlan", "br"];
+ list<string> dev_types = ["eth", "tr", "vlan", "br", "tun", "tap"];
if(Arch::s390 ()) dev_types = (list<string>) merge(dev_types, [ "hsi", "ctc", "escon", "ficon", "iucv", "qeth", "lcs"]);
else dev_types = (list<string>) merge(dev_types, [ "arc", "bnep", "dummy", "fddi", "myri", "usb", "wlan", "bond" ]);
if(Arch::ia64 ()) dev_types = add(dev_types, "xp");
@@ -934,7 +935,11 @@
/* Device type label */
"vlan" : [ _("VLAN"), _("Virtual LAN") ],
/* Device type label */
- "br" : [ _("Network Bridge"), _("Network Bridge") ],
+ "br" : [ _("Bridge"), _("Network Bridge") ],
+ /* Device type label */
+ "tun" : [ _("TUN"), _("Network TUNnel") ],
+ /* Device type label */
+ "tap" : [ _("TAP"), _("Network TAP") ],
];
if(haskey(device_types, type)) return device_types[type, (longdescr==true) ? 1 : 0]:"";
Modified: trunk/yast2/package/yast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=49418&r1=49417&r2=49418&view=diff
==============================================================================
--- trunk/yast2/package/yast2.changes (original)
+++ trunk/yast2/package/yast2.changes Fri Jul 25 16:01:50 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Jul 25 16:00:44 CEST 2008 - mzugec@suse.cz
+
+- support for tunnel devices in NetworkInterfaces (FaTE#302184)
+- 2.17.9
+
+-------------------------------------------------------------------
Tue Jul 22 20:12:41 CEST 2008 - locilka@suse.cz
- Added new DnsServerAPI::GetReverseIPforIPv6 function.
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
mzugec＠svn.opensuse.org