Author: mzugec Date: Tue Jun 1 14:37:37 2010 New Revision: 62080 URL: http://svn.opensuse.org/viewcvs/yast?rev=62080&view=rev Log: for bonding slaves use BusID based device names (bnc#564370) Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/VERSION?rev=62080&r1=62079&r2=62080&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/VERSION Tue Jun 1 14:37:37 2010 @@ -1 +1 @@ -2.13.136 +2.13.138 Modified: branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes?rev=62080&r1=62079&r2=62080&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes Tue Jun 1 14:37:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 27 17:08:23 CEST 2010 - mzugec@suse.de + +- for bonding slaves use BusID based device names (bnc#564370) +- 2.13.138 + +------------------------------------------------------------------- Wed Feb 17 09:38:52 CET 2010 - mzugec@suse.cz - L3: incorrect reported "not connected" status (bnc#561012) Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp?rev=62080&r1=62079&r2=62080&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp Tue Jun 1 14:37:37 2010 @@ -113,7 +113,7 @@ }); }); // use also unconfigured devices - foreach(string dev_name, Lan::getUnconfiguredDevices(),{ + foreach(string dev_name, Lan::getUnconfiguredDevices(true),{ items = add(items, `item(`id(dev_name), dev_name, contains(splitstring(NetworkDevices::Current["BRIDGE_PORTS"]:"", " "), dev_name))); }); @@ -141,7 +141,7 @@ list items = []; // unconfigured devices with proposal ifcfg-names settings["ETHERDEVICE"] = NetworkDevices::Current["ETHERDEVICE"]:""; - foreach(string dev_name, Lan::getUnconfiguredDevices(),{ + foreach(string dev_name, Lan::getUnconfiguredDevices(true),{ items = add(items, `item(`id(dev_name), dev_name, (dev_name==settings["ETHERDEVICE"]:"")?true:false)); }); // also bond and bridge devices included @@ -1053,7 +1053,9 @@ settings["BONDOPTION"] = Lan::bond_option; - foreach(string dev_name, Lan::getUnconfiguredDevices(),{ +y2internal("bond slaves"); + foreach(string dev_name, Lan::getUnconfiguredDevices(false),{ +y2internal("unconfigured slave %1", dev_name); wd["BONDSLAVE", "items"] = add(wd["BONDSLAVE", "items"]:[], `item(dev_name, dev_name)); }); //fill up the drop list and make the default value first Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp?rev=62080&r1=62079&r2=62080&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/modules/Lan.ycp Tue Jun 1 14:37:37 2010 @@ -873,16 +873,20 @@ } global define list > Unconfigured () { - return BuildUnconfigured ("netcard", Hardware); + list > bo = BuildUnconfigured ("netcard", Hardware); + return bo; } -global list<string> getUnconfiguredDevices(){ +global list<string> getUnconfiguredDevices(boolean byid){ list<string> devices = []; foreach(map device, Unconfigured(), { - string proposed = proposeIfcfgName(Hardware[tointeger(deletechars(device["id"]:"", "-"))]:$[]); + map hw = Hardware[tointeger(deletechars(device["id"]:"", "-"))]:$[]; + if (!byid) hw["mac"]=""; + string proposed = proposeIfcfgName(hw); y2milestone("propose name for unconfigured device : %1", proposed); devices = add(devices, proposed); }); +y2internal("devices %1", devices); return devices; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org