Author: mvidner Date: Mon Jun 6 18:42:35 2011 New Revision: 64237 URL: http://svn.opensuse.org/viewcvs/yast?rev=64237&view=rev Log: VLAN fixes partially fixed initing of vlan widgets at edit (moved out of widget init) disabled HandleVLANSlave, surrounding code is not ready for device renaming Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp?rev=64237&r1=64236&r2=64237&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Mon Jun 6 18:42:35 2011 @@ -123,9 +123,6 @@ */ void InitVLANSlave(string key) { - settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; - settings["VLAN_ID"] = tointeger(NetworkInterfaces::Current["VLAN_ID"]:"0"); - list items = []; map configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { @@ -140,13 +137,8 @@ symbol HandleVLANSlave(string key, map event){ - if (event["EventReason"]:""=="ValueChanged"){ - string configname = sformat("%1.%2", UI::QueryWidget(`id(`vlan_eth), `Value), UI::QueryWidget(`id(`vlan_id), `Value)); - NetworkInterfaces::Name = configname; - LanItems::Items[LanItems::current, "ifcfg"]= configname; - UI::ChangeWidget(`id("IFCFGID"), `Value, configname); - } - return nil; + // formerly tried to edit ifcfg name. bad idea, surrounding code not ready + return nil; } /** @@ -830,6 +822,11 @@ // TODO: dynamic for dummy. or add dummy from outside? boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; + if (LanItems::type == "vlan") { + settings["ETHERDEVICE"] = LanItems::vlan_etherdevice; + settings["VLAN_ID"] = tointeger(LanItems::vlan_id); + } + if (contains(["tun", "tap"], LanItems::type)) { settings = $[ @@ -1083,7 +1080,10 @@ // address tab if(LanItems::operation == `add) { LanItems::device = NetworkInterfaces::device_num(ifcfgname); - LanItems::type = NetworkInterfaces::device_type(ifcfgname); + LanItems::type = NetworkInterfaces::GetTypeFromIfcfg(settings); + if (LanItems::type == nil) { + LanItems::type = NetworkInterfaces::device_type(ifcfgname); + } } LanItems::bootproto = settings["BOOTPROTO"]:""; Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp?rev=64237&r1=64236&r2=64237&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/lan/hardware.ycp Mon Jun 6 18:42:35 2011 @@ -539,8 +539,7 @@ LanItems::startmode="auto"; } if (LanItems::type=="vlan"){ - string vlanid=(string) UI::QueryWidget(`id(`num), `Value); - NetworkInterfaces::Current["VLAN_ID"] = vlanid; + LanItems::vlan_id = (string) UI::QueryWidget(`id(`num), `Value); } } Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp?rev=64237&r1=64236&r2=64237&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Mon Jun 6 18:42:35 2011 @@ -829,7 +829,8 @@ usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes"; description = GetDeviceVar (devmap, defaults, "NAME"); bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS"); - vlan_id = GetDeviceVar(devmap, defaults, "VLAN_ID"); + vlan_etherdevice = GetDeviceVar(devmap, defaults, "ETHERDEVICE"); + vlan_id = GetDeviceVar(devmap, defaults, "VLAN_ID"); // FIXME, remember that it can be implied from the name. probably bond_slaves=[]; foreach(any key, any value, devmap, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org