Author: mzugec Date: Thu Apr 17 17:33:00 2008 New Revision: 46795 URL: http://svn.opensuse.org/viewcvs/yast?rev=46795&view=rev Log: support for hsi hipersockets (bnc#383978) Modified: branches/SuSE-SLE-10-SP2-Branch/network/VERSION branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP2-Branch/network/src/clients/lan_auto.ycp branches/SuSE-SLE-10-SP2-Branch/network/src/lan/hardware.ycp branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/VERSION Thu Apr 17 17:33:00 2008 @@ -1 +1 @@ -2.13.117 +2.13.118 Modified: branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes Thu Apr 17 17:33:00 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 2 23:29:39 CEST 2008 - mzugec@suse.de + +- support for hsi hipersockets (bnc#383978) +- 2.13.118 + +------------------------------------------------------------------- Wed Apr 2 16:35:48 CET 2008 - mzugec@suse.de - adapted Lan::HaveXenBridge (bnc#375606) Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/src/clients/lan_auto.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/src/clients/lan_auto.ycp Thu Apr 17 17:33:00 2008 @@ -139,6 +139,9 @@ "MODULE_OPTIONS":options, "STARTMODE":start_mode ]; + foreach(string k, any v, (map<string, any>)mod, { + if (issubstring(k, "ccw"))module_data[toupper(k)]=v; + }); return $[device_name : module_data]; }); } @@ -215,6 +218,9 @@ list modules = []; foreach(string device, map mod, settings["hwcfg"]:$[], { map newmap = $[]; + foreach(string k, any v, (map<string, any>)mod, { + if (issubstring(k, "CCW")) newmap[tolower(k)]=v; + }); newmap["device"] = device; newmap["module"] = mod["MODULE"]:""; newmap["options"] = mod["MODULE_OPTIONS"]:""; Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network... ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/src/lan/hardware.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/src/lan/hardware.ycp Thu Apr 17 17:33:00 2008 @@ -599,14 +599,14 @@ string helptext = ""; term contents = `Empty (); - if(Lan::type == "qeth") { + if(Lan::type == "qeth" || Lan::type == "hsi") { contents = `HBox( `HSpacing(6), /* Frame label */ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`chan_mode), _("&Port Name"), Lan::chan_mode), + (Lan::type == "qeth")?`TextEntry(`id(`chan_mode), _("&Port Name"), Lan::chan_mode):`Empty(), `VSpacing(1), /* TextEntry label */ `TextEntry(`id(`qeth_options), Label::Options (), Lan::qeth_options), @@ -625,41 +625,37 @@ `HSpacing(6) ); /* S/390 dialog help: QETH Port name */ - helptext = _("<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>") + + if (Lan::type == "qeth") helptext = _("<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"); + helptext = helptext + /* S/390 dialog help: QETH Options */ _("<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>") + _("<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>") + _("<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>") + _("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"); } - +/* if(Lan::type == "hsi") { contents = `HBox( `HSpacing(6), - /* Frame label */ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), - /* TextEntry label */ `TextEntry(`id(`qeth_options), Label::Options (), Lan::qeth_options), `VSpacing(1), - /* CheckBox label */ `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))), `VSpacing(1), - /* CheckBox label */ `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))), - /* TextEntry label */ `TextEntry(`id(`qeth_macaddress), _("Layer2 &MAC Address"), Lan::qeth_macaddress), - `VSpacing(1) + `VSpacing(1), + `TextEntry(`id(`qeth_chanids), _("CHAN IDS"), Lan::qeth_chanids) ), `HSpacing(2))), `HSpacing(6) ); - /* S/390 dialog help: QETH */ helptext = _("<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>") + _("<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>") + _("<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>") + _("<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"); } - +*/ if(drvtype == "lcs") { contents = `HBox( `HSpacing(6), 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 Thu Apr 17 17:33:00 2008 @@ -690,6 +690,12 @@ // FIXME: MOD Module["options"] = hw["options"]:""; NetworkModules::Alias = hw["module"]:""; NetworkModules::Options = hw["options"]:""; +/* + if (contains(Map::Keys((map<string, any>)hw), "ccw_chan_num")) + NetworkModules::CCW_CHAN_NUM=hw["ccw_chan_num"]:""; + if (contains(Map::Keys((map<string, any>)hw), "ccw_chan_ids")) + NetworkModules::CCW_CHAN_IDS=hw["ccw_chan_ids"]:""; +*/ } else y2milestone("HOTPLUG(%1) -> ignoring modprobe.conf", hotplug); @@ -700,13 +706,15 @@ wl_channels = hw["wl_channels"]:nilliststring; wl_bitrates = hw["wl_bitrates"]:nilliststring; + qeth_chanids=hw["ccw_chan_ids"]:""; + string mac = hw["mac"]:""; string busid = hw["busid"]:""; // name of hwcfg if(busid != nil && busid != "") { nm_name = "bus-" + hw["bus"]:"" + "-" + hw["busid"]:""; - if(Arch::s390 ()) nm_name = type + "-" + nm_name; + if(Arch::s390 ()) nm_name = DriverType(type) + "-" + nm_name; } else { // #suse42421 - don't write hwcfg-static for pcmcia cards (PC and CardBus) @@ -1397,10 +1405,10 @@ if(alias == "") { newdev["_aliases"] = aliases; y2milestone("aliases %1", aliases); - NetworkDevices::Name = NetworkDevices::device_name(NetworkDevices::RealType(type, hotplug), device); + NetworkDevices::Name = NetworkDevices::device_name(NetworkDevices::RealType(DriverType(type), hotplug), device); } else - NetworkDevices::Name = NetworkDevices::alias_name(NetworkDevices::RealType(type, hotplug), device, alias); + NetworkDevices::Name = NetworkDevices::alias_name(NetworkDevices::RealType(DriverType(type), hotplug), device, alias); NetworkDevices::Current = newdev; NetworkDevices::Commit(); } @@ -1935,14 +1943,15 @@ map aymodule = GetModuleForInterface(interface["device"]:"", autoinstall_settings["modules"]:[]); - if (tosel != nil) { tosel["module"] = (aymodule["module"]:""!= "")? aymodule["module"]:"" : tosel["module"]:""; tosel["options"] = (aymodule["options"]:""!= "")? aymodule["options"]:"" : tosel["options"]:""; - + foreach(string k, any v, (map<string, any>)aymodule, { + if (issubstring(k, "ccw"))tosel[k]=v; + }); SelectHWMap(tosel); if (contains(["bond", "vlan", "br"], type)) device = NetworkDevices::device_num(tosel["device"]:""); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org