Author: mzugec Date: Tue Nov 16 11:12:12 2010 New Revision: 62856 URL: http://svn.opensuse.org/viewcvs/yast?rev=62856&view=rev Log: L3: accept unconfigured+BOOTPROTO=none bondslaves (bnc#652987) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=62856&r1=62855&r2=62856&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Tue Nov 16 11:12:12 2010 @@ -1 +1 @@ -2.17.145 +2.17.146 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=62856&r1=62855&r2=62856&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Tue Nov 16 11:12:12 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 16 11:07:19 CET 2010 - mzugec@suse.cz + +- L3: accept unconfigured+BOOTPROTO=none bondslaves (bnc#652987) +- 2.17.146 + +------------------------------------------------------------------- Mon Nov 15 12:31:45 CET 2010 - mzugec@suse.cz - correctly apply BusID based udev rules in AY (bnc#648270) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp?rev=62856&r1=62855&r2=62856&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Tue Nov 16 11:12:12 2010 @@ -163,8 +163,9 @@ map configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { - //filter the eth devices (BOOT_PROTO=none && START_MODE=off) - if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none") && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off")) + //filter the eth devices (BOOT_PROTO=none + // don't care about STARTMODE (see bnc#652987c6) + if (((string)configurations[devtype, devname, "BOOTPROTO"]:"" == "none")/* && ((string)configurations[devtype, devname, "STARTMODE"]:"" == "off")*/) items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), contains(settings["SLAVES"]:[], devname)) ); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org