April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46803 - /trunk/yast2/library/cwm/src/CWM.ycp
by locilka＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: locilka Date: Thu Apr 17 20:41:28 2008 New Revision: 46803 URL: http://svn.opensuse.org/viewcvs/yast?rev=46803&view=rev Log: Backward compatibility -- previously TextEntry was `opt(`hstretch) -- newly InputFiled has `hsquash by default -- CWM adds `opt(`hstretch) if missing Modified: trunk/yast2/library/cwm/src/CWM.ycp Modified: trunk/yast2/library/cwm/src/CWM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWM.ycp?re… ============================================================================== --- trunk/yast2/library/cwm/src/CWM.ycp (original) +++ trunk/yast2/library/cwm/src/CWM.ycp Thu Apr 17 20:41:28 2008 @@ -502,6 +502,10 @@ if (widget == `inputfield || widget == `textentry) { + // backward compatibility + if (! contains (argsof (opt_term), `hstretch)) { + opt_term = add (opt_term, `hstretch); + } w["widget"] = `InputField (id_term, opt_term, label); } else if (widget == `password) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46802 - /tags/stable-2_16_11/bootloader/
by juhliarik＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: juhliarik Date: Thu Apr 17 20:35:50 2008 New Revision: 46802 URL: http://svn.opensuse.org/viewcvs/yast?rev=46802&view=rev Log: Created tag stable-2_16_11 for bootloader Added: tags/stable-2_16_11/bootloader/ - copied from r46801, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46801 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: juhliarik Date: Thu Apr 17 20:35:37 2008 New Revision: 46801 URL: http://svn.opensuse.org/viewcvs/yast?rev=46801&view=rev Log: added new version 2.16.11 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=46801&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Thu Apr 17 20:35:37 2008 @@ -1 +1 @@ -2.16.10 +2.16.11 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Apr 17 20:35:37 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 17 20:19:04 CEST 2008 - juhliarik(a)suse.cz + +- new version +- 2.16.11 + +------------------------------------------------------------------- Thu Apr 17 20:02:19 CEST 2008 - locilka(a)suse.cz, juhliarik(a)suse.cz - fixed initializing of combo-box widgets in dialogs, ComboBox -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46800 - in /trunk/yast2: library/cwm/src/CWM.ycp library/cwm/src/CWMTsigKeys.ycp package/yast2.changes
by locilka＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: locilka Date: Thu Apr 17 20:30:15 2008 New Revision: 46800 URL: http://svn.opensuse.org/viewcvs/yast?rev=46800&view=rev Log: - Using `InputFiled instead of obsolete `TextEntry (in CWM). Modified: trunk/yast2/library/cwm/src/CWM.ycp trunk/yast2/library/cwm/src/CWMTsigKeys.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/cwm/src/CWM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWM.ycp?re… ============================================================================== --- trunk/yast2/library/cwm/src/CWM.ycp (original) +++ trunk/yast2/library/cwm/src/CWM.ycp Thu Apr 17 20:30:15 2008 @@ -469,7 +469,8 @@ */ global define map<string, any> prepareWidget (map<string, any> widget_descr) ``{ map<string, any> w = widget_descr; - symbol widget = w["widget"]:`textentry; + symbol widget = w["widget"]:`inputfield; + if (w["widget"]:nil == `empty) { w["widget"] = `VBox (); @@ -499,9 +500,9 @@ }); string label = w["label"]:w["_cwm_key"]:""; - if (widget == `textentry) + if (widget == `inputfield || widget == `textentry) { - w["widget"] = `TextEntry (id_term, opt_term, label); + w["widget"] = `InputField (id_term, opt_term, label); } else if (widget == `password) { Modified: trunk/yast2/library/cwm/src/CWMTsigKeys.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWMTsigKey… ============================================================================== --- trunk/yast2/library/cwm/src/CWMTsigKeys.ycp (original) +++ trunk/yast2/library/cwm/src/CWMTsigKeys.ycp Thu Apr 17 20:30:15 2008 @@ -560,7 +560,7 @@ `HBox ( `HWeight (7, `HBox ( - `TextEntry (`id ("_cwm_existing_key_file"), `opt (`hstretch), + `InputField (`id ("_cwm_existing_key_file"), `opt (`hstretch), // text entry Label::FileName ()) ) @@ -593,9 +593,9 @@ `HWeight (7, `HBox ( // text entry - `TextEntry (`id ("_cwm_new_key_id"), `opt (`hstretch), _("&Key ID")), + `InputField (`id ("_cwm_new_key_id"), `opt (`hstretch), _("&Key ID")), // text entry - `TextEntry (`id ("_cwm_new_key_file"), `opt (`hstretch), Label::FileName()) + `InputField (`id ("_cwm_new_key_file"), `opt (`hstretch), Label::FileName()) ) ), `HWeight (2, Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Apr 17 20:30:15 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 17 20:31:39 CEST 2008 - locilka(a)suse.cz + +- Using `InputFiled instead of obsolete `TextEntry (in CWM). + +------------------------------------------------------------------- Wed Apr 16 13:30:31 CEST 2008 - kmachalkova(a)suse.cz - Wizard.ycp: Generic tree dialog introduced - left help panel -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46799 - in /trunk/bootloader: package/ src/elilo/ src/generic/ src/routines/
by locilka＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: locilka Date: Thu Apr 17 20:26:04 2008 New Revision: 46799 URL: http://svn.opensuse.org/viewcvs/yast?rev=46799&view=rev Log: - using `InputField as a replacement for obsolete `TextEntry. Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/elilo/widgets.ycp trunk/bootloader/src/generic/widget_funcs.ycp trunk/bootloader/src/routines/dialogs_i386.ycp trunk/bootloader/src/routines/global_widgets.ycp trunk/bootloader/src/routines/section_widgets.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Apr 17 20:26:04 2008 @@ -3,6 +3,7 @@ - fixed initializing of combo-box widgets in dialogs, ComboBox in Qt does not accept `Value, using `Items instead (bnc #380781). +- using `InputField as a replacement for obsolete `TextEntry. ------------------------------------------------------------------- Wed Apr 16 15:20:15 CEST 2008 - juhliarik(a)suse.cz Modified: trunk/bootloader/src/elilo/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/elilo/widgets.ycp… ============================================================================== --- trunk/bootloader/src/elilo/widgets.ycp (original) +++ trunk/bootloader/src/elilo/widgets.ycp Thu Apr 17 20:26:04 2008 @@ -43,7 +43,7 @@ // check box _("&Create EFI Entry"))), `VSpacing (0.6), - `Left (`TextEntry (`id (`location), + `Left (`InputField (`id (`location), `opt (`hstretch), // text entry label _("&EFI Entry Name"))), have_old ? `VSpacing (1) : `VSpacing (0), Modified: trunk/bootloader/src/generic/widget_funcs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/widget_fu… ============================================================================== --- trunk/bootloader/src/generic/widget_funcs.ycp (original) +++ trunk/bootloader/src/generic/widget_funcs.ycp Thu Apr 17 20:26:04 2008 @@ -111,11 +111,11 @@ if ( type == "radio" || type == "check") { new = `Left(`HBox ( enable_widget, - `TextEntry(`id( key ), "") + `InputField(`id( key ), `opt (`hstretch), "") )); } else { - new = `TextEntry(`id( key ), desc); + new = `InputField(`id( key ), `opt (`hstretch), desc); } } else if (value == "password") { Modified: trunk/bootloader/src/routines/dialogs_i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/dialogs_… ============================================================================== --- trunk/bootloader/src/routines/dialogs_i386.ycp (original) +++ trunk/bootloader/src/routines/dialogs_i386.ycp Thu Apr 17 20:26:04 2008 @@ -121,7 +121,7 @@ { term popup = `VBox (`VSpacing (1), // textentry header - `TextEntry (`id (`devname), _("&Device")), + `InputField (`id (`devname), `opt (`hstretch), _("&Device")), `VSpacing (1), `HBox (`HStretch (), `PushButton (`id (`ok), `opt (`key_F10, `default), Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_w… ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Thu Apr 17 20:26:04 2008 @@ -105,7 +105,9 @@ list sec = maplist (map<string,any> s, sects, { string image = s["kernel"]:""; string root = (BootCommon::getHintedPartitionList ([s["root"]:""]))[0]:""; + return `item (`id (s["name"]:""), + // FIXME: do not match against key "name" (can be changed by user when editing section) tolower (BootCommon::globals["default"]:"") == tolower (s["name"]:"") ? UI::Glyph (`CheckMark) : "", Modified: trunk/bootloader/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_… ============================================================================== --- trunk/bootloader/src/routines/section_widgets.ycp (original) +++ trunk/bootloader/src/routines/section_widgets.ycp Thu Apr 17 20:26:04 2008 @@ -350,7 +350,7 @@ "kernel" : $[ "widget" : `custom, "custom_widget" : Stage::initial () - ? `TextEntry (`id ("kernel"), `opt (`hstretch), + ? `InputField (`id ("kernel"), `opt (`hstretch), // text entry _("&Kernel")) : `HBox ( @@ -372,7 +372,7 @@ "initrd" : $[ "widget" : `custom, "custom_widget" : Stage::initial () - ? `TextEntry (`id ("initrd"), `opt (`hstretch), + ? `InputField (`id ("initrd"), `opt (`hstretch), // text entry _("&Initial RAM Disk")) : `HBox ( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46798 - in /trunk/bootloader: package/yast2-bootloader.changes src/generic/widget_funcs.ycp
by locilka＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: locilka Date: Thu Apr 17 20:02:41 2008 New Revision: 46798 URL: http://svn.opensuse.org/viewcvs/yast?rev=46798&view=rev Log: - fixed initializing of combo-box widgets in dialogs, ComboBox in Qt does not accept `Value, using `Items instead (bnc #380781). Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/generic/widget_funcs.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Apr 17 20:02:41 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 17 20:02:19 CEST 2008 - locilka(a)suse.cz, juhliarik(a)suse.cz + +- fixed initializing of combo-box widgets in dialogs, ComboBox + in Qt does not accept `Value, using `Items instead (bnc #380781). + +------------------------------------------------------------------- Wed Apr 16 15:20:15 CEST 2008 - juhliarik(a)suse.cz - added fix for activating DM-RAID boot partition (bnc #337742) Modified: trunk/bootloader/src/generic/widget_funcs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/widget_fu… ============================================================================== --- trunk/bootloader/src/generic/widget_funcs.ycp (original) +++ trunk/bootloader/src/generic/widget_funcs.ycp Thu Apr 17 20:02:41 2008 @@ -299,7 +299,14 @@ } else if (contains(["string", "path", "select", "selectdevice"], (string)value)) { - UI::ChangeWidget (`id (key), `Value, data[key]:""); + + // ComboBox doesn't accept `Value, use `Items instead + // See bnc #380781 + if (UI::QueryWidget (`id (key), `WidgetClass) == "YComboBox") { + UI::ChangeWidget (`id (key), `Items, [data[key]:""]); + } else { + UI::ChangeWidget (`id (key), `Value, data[key]:""); + } } else if (value == "password") { UI::ChangeWidget (`id (key + "_pw1"), `Value, "**********"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46797 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ep-all.ycp modules/StorageFields.ycp
by aschnell＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: aschnell Date: Thu Apr 17 19:55:05 2008 New Revision: 46797 URL: http://svn.opensuse.org/viewcvs/yast?rev=46797&view=rev Log: - added convenience function Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp Thu Apr 17 19:55:05 2008 @@ -54,14 +54,10 @@ { import "Hostname"; - term header = StorageFields::TableHeader(fields); string short_hostname = Hostname::CurrentHostname(); - map<string, map> target_map = Storage::GetTargetMap(); - list table_list = StorageFields::TableContents(fields, target_map, predicate_all); UI::ReplaceWidget(`tree_panel, - Greasemonkey::Transform( `VBox( `Left(`Heading( sformat(_("Available Storage on %1"), short_hostname))), @@ -79,9 +75,8 @@ `id(filter_))), */ - `Table(`id(`table), `opt(`keepSorting), - header, table_list) - ))); + StorageFields::Table(fields, target_map, predicate_all) + )); Wizard::RestoreHelp("Help about view with all devices"); } Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Thu Apr 17 19:55:05 2008 @@ -628,6 +628,16 @@ } + global term Table(list<symbol> fields, map<string, map> target_map, + symbol(map, map) predicate) + { + term header = TableHeader(fields); + list<term> content = TableContents(fields, target_map, predicate); + + return `Table(`opt(`keepSorting), header, content); + } + + global term Overview(list<symbol> fields, map<string, map> target_map, string device) { map disk = Storage::GetDisk(target_map, device); @@ -636,13 +646,13 @@ if (part == $[]) part = nil; - string ret = mergestring(maplist(symbol field, fields, { + string text = mergestring(maplist(symbol field, fields, { if (field == `newline) return "\n"; else return MakeSubInfo(disk, part, field, `overview); }), ""); - return `RichText(`opt(`plainText, `hstretch, `vstretch), ret); + return `RichText(`opt(`plainText, `hstretch, `vstretch), text); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46796 - /tags/branch-SLE-10-SP2-2_13_118/network/
by mzugec＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: mzugec Date: Thu Apr 17 17:33:16 2008 New Revision: 46796 URL: http://svn.opensuse.org/viewcvs/yast?rev=46796&view=rev Log: Created tag branch-SLE-10-SP2-2_13_118 for network Added: tags/branch-SLE-10-SP2-2_13_118/network/ - copied from r46795, branches/SuSE-SLE-10-SP2-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46795 - in /branches/SuSE-SLE-10-SP2-Branch/network: VERSION package/yast2-network.changes src/clients/lan_auto.ycp src/lan/hardware.ycp src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 17 Apr '08

17 Apr '08

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/networ… ============================================================================== --- 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/networ… ============================================================================== --- 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(a)suse.de + +- support for hsi hipersockets (bnc#383978) +- 2.13.118 + +------------------------------------------------------------------- Wed Apr 2 16:35:48 CET 2008 - mzugec(a)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/networ… ============================================================================== --- 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/networ… ============================================================================== --- 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 = _("Enter the Port Name for this interface (case-sensitive).") + + if (Lan::type == "qeth") helptext = _("Enter the Port Name for this interface (case-sensitive)."); + helptext = helptext + /* S/390 dialog help: QETH Options */ _("Enter any additional Options for this interface (separated by spaces).") + _("Select Enable IPA Takeover if IP address takeover should be enabled for this interface.") + _("Select Enable Layer 2 Support if this card has been configured with layer 2 support.") + _("Enter the Layer 2 MAC Address if this card has been configured with layer 2 support."); } - +/* 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 = _("Enter any additional Options for this interface (separated by spaces).") + _("Select Enable IPA Takeover if IP address takeover should be enabled for this interface.") + _("Select Enable Layer 2 Support if this card has been configured with layer 2 support.") + _("Enter the Layer 2 MAC Address if this card has been configured with layer 2 support."); } - +*/ 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/networ… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46794 - in /trunk/installation: package/yast2-installation.changes src/modules/ImageInstallation.ycp
by locilka＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: locilka Date: Thu Apr 17 17:13:24 2008 New Revision: 46794 URL: http://svn.opensuse.org/viewcvs/yast?rev=46794&view=rev Log: - Added more debugging messages into ImageInstallation module. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Apr 17 17:13:24 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 17 17:15:02 CEST 2008 - locilka(a)suse.cz + +- Added more debugging messages into ImageInstallation module. + +------------------------------------------------------------------- Thu Apr 17 14:01:46 CEST 2008 - locilka(a)suse.cz - Added image-downloading progress (reusing existent progress bar). Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Thu Apr 17 17:13:24 2008 @@ -593,7 +593,13 @@ return true; // does architecture match? } else { - return (contains (imageset_archs, arch_short)); + if (contains (imageset_archs, arch_short)) { + return true; + } else { + // For debugging purpose + y2milestone ("Filtered-out, Patterns: %1, Archs: %2", image["patterns"]:"", image["archs"]:""); + return false; + } } }); @@ -613,6 +619,10 @@ if (matching_patterns[pattern]:0 > 0) { possible_patterns[pattern] = image; + } else { + // For debugging purpose + y2milestone ("Filtered-out, Patterns: %1, Matching: %2", + image["patterns"]:"", matching_patterns[pattern]:-1); } } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0