Author: mzugec Date: Fri Dec 7 15:50:39 2007 New Revision: 42814 URL: http://svn.opensuse.org/viewcvs/yast?rev=42814&view=rev Log: support for VLAN - FaTE (#142127) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=42814&r1=... ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Dec 7 15:50:39 2007 @@ -1 +1 @@ -2.16.13 +2.16.14 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.cha... ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Dec 7 15:50:39 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 7 15:48:19 CET 2007 - mzugec@suse.cz + +- support for VLAN - FaTE (#142127) +- 2.16.14 + +------------------------------------------------------------------- Mon Dec 3 18:54:09 CET 2007 - mzugec@suse.cz - modprobe ndiswrapper before hwinfo when needed (#343893) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=4... ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Fri Dec 7 15:50:39 2007 @@ -108,7 +108,17 @@ */ void InitVLANSlave(string key) { - UI::ChangeWidget(`id(key), `CurrentItem, settings["ETHERDEVICE"]:""); + list items = []; + settings["ETHERDEVICE"] = NetworkDevices::Current["ETHERDEVICE"]:""; + foreach(integer row, any value, LanItems::Items,{ + LanItems::current = row; + if (!LanItems::IsItemConfigured()){ + string dev_name = LanItems::getCurrentItem()["hwinfo", "dev_name"]:""; + if (hasAnyValue(dev_name)) items = add(items, `item(`id(dev_name), dev_name, (dev_name==settings["ETHERDEVICE"]:"")?true:false)); +//wd["ETHERDEVICE", "items"] = add( wd["ETHERDEVICE", "items"]:[], [ dev_name ] ); + } + }); + UI::ChangeWidget(`id(key), `Items, items); } /** @@ -118,7 +128,7 @@ */ void StoreVLANSlave(string key, map event) { - settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(key), `CurrentItem); + settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(key), `Value); } @@ -155,6 +165,7 @@ * @param key id of the widget */ void initBootProto (string key) { + if (LanItems::type=="vlan") UI::ReplaceWidget(`rp, `Empty()); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -491,9 +502,9 @@ ], "ETHERDEVICE": $[ - "widget": `selection_box, + "widget": `combobox, "label": _("Real Interface for &VLAN"), - "opt": [`shrinkable], +// "opt": [`shrinkable], "items" : [ ], "init": InitVLANSlave, "store": StoreVLANSlave, @@ -524,7 +535,7 @@ "custom_widget": `RadioButtonGroup(`id(`bootproto), `VBox( - `Left(`RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)"))), + `ReplacePoint(`id(`rp), `Left(`RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)")))), `Left(`HBox( `RadioButton(`id(`dynamic), `opt(`notify), _("Dynamic Address")), `ComboBox(`id(`dyn), "", [ @@ -764,6 +775,11 @@ is_ptp? address_p2p_contents: (no_dhcp? address_static_contents: address_dhcp_contents); + term address_contents = `VBox( + `Left(label), + just_address_contents, + frame2 + ); if (LanItems::type == "bond") { @@ -788,48 +804,19 @@ return v[0]:"" != LanItems::bond_option; }); wd["BONDOPTION", "items"] = prepend(wd["BONDOPTION", "items"]:[], [LanItems::bond_option]); - } - - if (LanItems::type == "vlan") - { - foreach(integer row, any value, LanItems::Items,{ - LanItems::current = row; - if (!LanItems::IsItemConfigured()){ - string dev_name = LanItems::getCurrentItem()["hwinfo", "dev_name"]:""; - if (hasAnyValue(dev_name)) wd["ETHERDEVICE", "items"] = add( wd["ETHERDEVICE", "items"]:[], [ dev_name ] ); - } - }); -settings["ETHERDEVICE"] = NetworkDevices::Current["ETHERDEVICE"]:""; -settings["STARTMODE"] = "onboot"; - } - - - term address_contents = `VBox( - `Left(label), - just_address_contents, - frame2 - ); - if (LanItems::type == "bond") - { address_contents = `VBox( `Left(label), just_address_contents, `MarginBox(1, 0, `Frame( "", `VBox("BONDSLAVE", "BONDOPTION"))), frame2 ); - } else if (LanItems::type == "vlan"){ + } + else if (LanItems::type == "vlan") + { + settings["STARTMODE"] = "onboot"; address_contents = `VBox( `Left(label), - just_address_contents, - `MarginBox(1, 0, `Frame( "", `VBox("ETHERDEVICE"))), - frame2 - ); -} - - else - { - address_contents = `VBox( - `Left(label), + `Left( `VBox("ETHERDEVICE")), just_address_contents, "AD_ADDRESSES", frame2 @@ -881,11 +868,11 @@ // Address tab help "help": _("<p>Configure your IP address.</p>"), ], - "hardware" : $[ + "hardware" : $[ "header" : _("&Hardware"), "contents" : `VBox( "HWDIALOG" ) ], - "t3" : $[ + "t3" : $[ "header" : _("&Wireless"), "contents" : `Empty (), "widget_names" : [], @@ -896,6 +883,8 @@ "tab_help" : "", "fallback_functions" : functions, ]; + if (LanItems::type=="vlan") wd_content["tab_order"]= ["t_general", "t_addr"]; + hw_standalone=false; wd = (map<string, map<string,any> >) union (wd, $[ Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=4... ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Fri Dec 7 15:50:39 2007 @@ -1114,6 +1114,10 @@ { if (!PackageSystem::Installed("wireless-tools")) pkgs = add (pkgs, "wireless-tools"); } + if (NetworkDevices::List ("vlan") != []) + { + if (!PackageSystem::Installed("vlan")) pkgs = add (pkgs, "vlan"); + } // #47809 if (NetworkDevices::Locate ("WIRELESS_AUTH_MODE", "psk") != [] || NetworkDevices::Locate ("WIRELESS_AUTH_MODE", "eap") != []) Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?... ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Fri Dec 7 15:50:39 2007 @@ -311,6 +311,8 @@ map startmode_descrs = $[ // summary description of STARTMODE=auto "auto": _("Started automatically at boot"), + // summary description of STARTMODE=auto + "onboot": _("Started automatically at boot"), // summary description of STARTMODE=hotplug "hotplug": _("Started automatically at boot"), // summary description of STARTMODE=ifplugd @@ -396,7 +398,8 @@ } else overview = add(overview, Summary::Device(descr, Summary::NotConfigured())); - string conn = HTML::Bold ( (Items[key, "hwinfo", "link"]:false == true)?"":_("(not connected)") ); + string conn = HTML::Bold ( (Items[key, "hwinfo", "link"]:false == true)?"":sformat("(%1)", _("not connected") )); + if (size(Items[key, "hwinfo"]:$[])==0) conn = HTML::Bold(sformat("(%1)", _("no hwinfo"))); string mac_dev=""; if (hasAnyValue(Items[key, "hwinfo", "mac"]:"")) mac_dev= HTML::Bold ("MAC : ") + Items[key, "hwinfo", "mac"]:"" + "<br>"; else if (hasAnyValue(Items[key, "hwinfo", "busid"]:"")) mac_dev= HTML::Bold ("BusID : ") + Items[key, "hwinfo", "busid"]:"" + "<br>"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org