[yast-commit] r56016 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp

Author: mzugec Date: Mon Mar 9 15:00:37 2009 New Revision: 56016 URL: http://svn.opensuse.org/viewcvs/yast?rev=56016&view=rev Log: - improve address dialog for vlan (bnc#376063) - allow all netcard devices except vlan, bridge and bond to be etherdevice for vlan 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=56016&r1=56015&r2=56016&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Mar 9 15:00:37 2009 @@ -1 +1 @@ -2.18.16 +2.18.17 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=56016&r1=56015&r2=56016&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Mar 9 15:00:37 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Mar 9 14:58:10 CET 2009 - mzugec@suse.cz + +- improve address dialog for vlan (bnc#376063) +- allow all netcard devices except vlan, bridge and bond to be +etherdevice for vlan +- 2.18.17 + +------------------------------------------------------------------- Thu Mar 5 14:27:19 CET 2009 - mzugec@suse.cz - in DSL module list also pppoe devices (bnc#449982) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=56016&r1=56015&r2=56016&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Mon Mar 9 15:00:37 2009 @@ -122,14 +122,16 @@ */ void InitVLANSlave(string key) { - settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; + settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; - list items = createUnconfigured([settings["ETHERDEVICE"]:""]); - - foreach (string dev_name, NetworkInterfaces::List("br|bond"), { - items = add(items, `item(`id(dev_name), dev_name, - (dev_name==settings["ETHERDEVICE"]:"")?true:false)); - }); + list items = []; + map configurations = NetworkInterfaces::FilterDevices("netcard"); + foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { + foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { + if (contains(["vlan", "bond", "br"], NetworkInterfaces::GetType(devname))) continue; + items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), settings["ETHERDEVICE"]:""==devname) ); + }); + }); UI::ChangeWidget(`id(key), `Items, items); } @@ -205,7 +207,7 @@ * @param key id of the widget */ void initBootProto (string key) { - if (contains(["vlan", "br"], LanItems::type)) UI::ReplaceWidget(`rp, `Empty()); + if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -818,29 +820,19 @@ "IFCFGTYPE", `HSpacing(1.5), `MinWidth(30, "IFCFGID"), - `HSpacing(0.5) + `HSpacing(0.5), + LanItems::type=="vlan" ? `VBox("ETHERDEVICE") : `Empty() ); if(LanItems::operation != `add) { if(LanItems::alias == "") { settings["IFCFG"] = LanItems::device; } else { -// settings["IFCFG"] = NetworkInterfaces::alias_name(NetworkInterfaces::RealType(LanItems::type, LanItems::hotplug), LanItems::device, LanItems::alias); settings["IFCFG"] = LanItems::device; } } list<string> mb_items = []; -// if (!NetworkService::IsManaged()) mb_items = add(mb_items, "ADDITIONAL_ADDRESSES"); - - // Allow changing s390 options, except for iucv, where the option - // is in the name of the hwcfg file. Haven't figured it out yet. -/* - if (Arch::s390 () && drvtype != "iucv") - { - mb_items = add(mb_items, "S390"); - } -*/ wd["ADVANCED_MB", "items"] = maplist (string btn, mb_items, { // TODO helps return [btn, wd[btn, "label"]:btn]; @@ -913,17 +905,6 @@ frame2 ); } - else if (LanItems::type == "vlan") - { - settings["STARTMODE"] = "onboot"; - address_contents = `VBox( - `Left(label), - `Left( `VBox("ETHERDEVICE")), - just_address_contents, - "AD_ADDRESSES", - frame2 - ); - } else if (LanItems::type == "br") { address_contents = `VBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org