Author: mvidner Date: Thu Jul 28 16:51:20 2011 New Revision: 65080 URL: http://svn.opensuse.org/viewcvs/yast?rev=65080&view=rev Log: Added Assert; fixed INTERFACETYPE=br (bnc#704999). via svn merge -r 65077:65079 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/yast2 Added: trunk/yast2/library/modules/Assert.ycp - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp Modified: trunk/yast2/ (props changed) trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/package/ (props changed) trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=65080&r1=65079&r2=65080&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Jul 28 16:51:20 2011 @@ -1 +1 @@ -2.21.7 +2.21.8 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=65080&r1=65079&r2=65080&view=diff ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Thu Jul 28 16:51:20 2011 @@ -182,10 +182,27 @@ list<string> TypeByKeyValue = [ "INTERFACETYPE", - "TUNNEL", ]; list TypeByKeyExistence = [ ["ETHERDEVICE", "vlan"], + ["WIRELESS_MODE", "wlan"], + ["MODEM_DEVICE", "ppp"], + ]; +list TypeByValueMatch = [ + ["BONDING_MASTER", "yes", "bond"], + ["BRIDGE", "yes", "br"], + ["WIRELESS", "yes", "wlan"], + ["TUNNEL", "tap", "tap"], + ["TUNNEL", "tun", "tun"], + ["TUNNEL", "sit", "sit"], + ["TUNNEL", "gre", "gre"], + ["TUNNEL", "ipip", "ipip"], + ["PPPMODE", "pppoe", "ppp"], + ["PPPMODE", "pppoatm", "ppp"], + ["PPPMODE", "capi-adsl", "ppp"], + ["PPPMODE", "pptp", "ppp"], + ["ENCAP", "syncppp", "isdn"], + ["ENCAP", "rawip", "isdn"], ]; /** @@ -193,6 +210,14 @@ */ global string GetTypeFromIfcfg(ifcfg_t ifcfg) { string type = nil; // unknown + foreach(list<string> key_type, TypeByValueMatch, { + string rule_key = key_type[0]:""; + string rule_value = key_type[1]:""; + string rule_type = key_type[2]:""; + if (ifcfg[rule_key]:"" == rule_value) { + type = rule_type; + } + }); foreach(list<string> key_type, TypeByKeyExistence, { string rule_key = key_type[0]:""; string rule_type = key_type[1]:""; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=65080&r1=65079&r2=65080&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jul 28 16:51:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 16:23:46 CEST 2011 - mvidner@suse.cz + +- Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). +- 2.21.8 + +------------------------------------------------------------------- Wed Jul 27 09:29:36 UTC 2011 - lslezak@suse.cz - command line - properly display multiline help texts (bnc#708553) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org