Author: mzugec Date: Tue Nov 16 11:14:11 2010 New Revision: 62859 URL: http://svn.opensuse.org/viewcvs/yast?rev=62859&view=rev Log: accept unconfigured + BOOTPROTO=none bondslaves (bnc#652987) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62859&r1=62858&r2=62859&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Nov 16 11:14:11 2010 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62859&r1=62858&r2=62859&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Nov 16 11:14:11 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 16 11:13:12 CET 2010 - mzugec@suse.cz + +- accept unconfigured + BOOTPROTO=none bondslaves (bnc#652987) +- 2.20.4 + +------------------------------------------------------------------- Mon Nov 15 12:37:29 CET 2010 - mzugec@suse.cz - correctly apply BusID based udev rules in AY (bnc#648270) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=62859&r1=62858&r2=62859&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Tue Nov 16 11:14:11 2010 @@ -196,8 +196,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