Author: mzugec Date: Sat Dec 8 13:42:36 2007 New Revision: 42847 URL: http://svn.opensuse.org/viewcvs/yast?rev=42847&view=rev Log: fixed bond and vlan in autoYaST Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp Sat Dec 8 13:42:36 2007 @@ -669,6 +669,7 @@ /* dummy */ else y2milestone("No detailed HW info: %1", dev); + y2milestone("proposed ifcfg name : %1", dev); return dev; } @@ -983,6 +984,7 @@ usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes"; description = GetDeviceVar (devmap, defaults, "NAME"); bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS"); + vlan_etherdevice = GetDeviceVar(devmap, defaults, "ETHERDEVICE"); bond_slaves=[]; foreach(any key, any value, devmap, @@ -1389,7 +1391,6 @@ } else NetworkDevices::Name = NetworkDevices::alias_name(NetworkDevices::RealType(type, hotplug), device, alias); - NetworkDevices::Current = newdev; NetworkDevices::Commit(); } @@ -1474,6 +1475,10 @@ tosel=$["device":interface["device"]:"", "type":"bond"]; y2milestone("found bonding device"); } + if (issubstring(interface["device"]:"", "vlan")) { + tosel=$["device":interface["device"]:"", "type":"vlan"]; + y2milestone("found vlan configuration"); + } list device_id = splitstring(interface["device"]:"", "-"); /* code for eth-id-00:80:c8:f6:48:4c configurations */ // *-id-$ID => find H["mac"] == $ID @@ -1907,7 +1912,6 @@ Add(); tosel = FindMatchingDevice(interface); - y2milestone("tosel=%1", tosel); // Read module data from autoyast @@ -1923,6 +1927,7 @@ aymodule["options"]:"" : tosel["options"]:""; SelectHWMap(tosel); + if (type=="bond" || type=="vlan") device = NetworkDevices::device_num(tosel["device"]:""); } /* Nothing detected -> use InstallInf */ else if(size(InstallInf) > 0) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org