Author: mvidner
Date: Thu Sep 15 16:02:28 2011
New Revision: 65727
URL: http://svn.opensuse.org/viewcvs/yast?rev=65727&view=rev
Log:
Added the interface name patterns emN, pN and pNpM,
failing the previous attempts to allow arbitrary names.
Fixes recognizing them as configured (bnc#713644)
and unbreaks the proposed bridged configuration (bnc#713048).
Modified:
branches/SuSE-Code-11-SP2-Branch/yast2/VERSION
branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp
branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes
Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/VERSION?rev=65727&r1=65726&r2=65727&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original)
+++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Thu Sep 15 16:02:28 2011
@@ -1 +1 @@
-2.17.111
+2.17.112
Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp?rev=65727&r1=65726&r2=65727&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp Thu Sep 15 16:02:28 2011
@@ -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|tun|tap|ib",
+ "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|ib|em|p|p[0-9]+p",
"modem" : "ppp|modem",
"isdn" : "isdn|ippp",
"dsl" : "dsl",
@@ -255,12 +255,13 @@
* @example GetDeviceType(modem0) -> "Modem"
*/
global string GetDeviceType(string dev) {
- if (regexpmatch(dev,"^" + DeviceRegex["netcard"]:"")) {
- return(_("Network Card"));
- }
- else if (regexpmatch(dev,"^" + DeviceRegex["modem"]:"")) {
+ // pppN must be tried before pN, modem before netcard
+ if (regexpmatch(dev,"^" + DeviceRegex["modem"]:"")) {
return(_("Modem"));
}
+ else if (regexpmatch(dev,"^" + DeviceRegex["netcard"]:"")) {
+ return(_("Network Card"));
+ }
else if (regexpmatch(dev,"^" + DeviceRegex["isdn"]:"")) {
return(_("ISDN"));
}
Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes?rev=65727&r1=65726&r2=65727&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original)
+++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Thu Sep 15 16:02:28 2011
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Sep 15 15:23:50 CEST 2011 - mvidner@suse.cz
+
+- Added the interface name patterns emN, pN and pNpM.
+ It fixes recognizing them as configured (bnc#713644)
+ and unbreaks the proposed bridged configuration (bnc#713048).
+- 2.17.112
+
+-------------------------------------------------------------------
Tue Sep 13 10:39:42 CEST 2011 - locilka@suse.cz
- Fixed SuSEfirewall2 SCR agent to understand single-quoted and
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
