Author: juhliarik Date: Tue Mar 10 17:06:13 2009 New Revision: 56061 URL: http://svn.opensuse.org/viewcvs/yast?rev=56061&view=rev Log: updated handling of serial console Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp?rev=56061&r1=56060&r2=56061&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootCommon.ycp Tue Mar 10 17:06:13 2009 @@ -924,10 +924,6 @@ if (bl == "none") return true; - // FATE: #110038: Serial console - // check and add console key with value for sections - addConsole(); - // FIXME: give mountby information to perl-Bootloader (or define some // better interface), so that perl-Bootloader can use mountby device names // for these devices instead. Tracked in bug #248162. Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp?rev=56061&r1=56060&r2=56061&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp Tue Mar 10 17:06:13 2009 @@ -72,12 +72,27 @@ void InitConsole( string widget){ boolean enable = BootCommon::globals["terminal"]:"" == "serial"; UI::ChangeWidget(`id(`console_frame),`Value, enable); - string args = BootCommon::globals["console"]:""; + string args = BootCommon::globals["serial"]:""; UI::ChangeWidget(`id(`console_args),`Value, args); } void StoreConsole(string widget, map event){ - //TODO + boolean use_serial = (boolean) UI::QueryWidget(`id(`console_frame),`Value); + if (use_serial) + { + BootCommon::globals["terminal"] = "serial"; + string console_value = (string) UI::QueryWidget(`id(`console_args),`Value); + if (console_value != "") + BootCommon::globals["serial"] = console_value; + } else { + if (haskey(BootCommon::globals, "terminal")) + BootCommon::globals = remove(BootCommon::globals, "terminal"); + if (haskey(BootCommon::globals, "serial")) + BootCommon::globals = remove(BootCommon::globals, "serial"); + } + // FATE: #110038: Serial console + // add or remove console key with value for sections + BootCommon::HandleConsole(); } symbol HandleConsole(string widget, map event){ Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp?rev=56061&r1=56060&r2=56061&view=diff ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/misc.ycp Tue Mar 10 17:06:13 2009 @@ -2602,44 +2602,42 @@ * - add key console with value to section type image and xen */ -define void addConsole() +global define void HandleConsole() { string console_value = getConsoleValue(); - if ((console_value != "") && (console_value != nil)) - { - // list of idexes from sections where is image or xen - list < integer > list_index =[]; - // counter - integer index = -1; - foreach(map section, sections, - { - index = index +1; - if ((section["type"]:"" == "image") || (search(section["type"]:"", "xen") != nil)) - list_index = add(list_index, index); - }); + // list of idexes from sections where is image or xen + list < integer > list_index =[]; + // counter + integer index = -1; + foreach(map section, sections, + { + index = index +1; + if ((section["type"]:"" == "image") || (search(section["type"]:"", "xen") != nil)) + list_index = add(list_index, index); + }); - // add key console with value - if (size(list_index) > 0) + // add key console with value + if (size(list_index) > 0) + { + foreach (integer idx, list_index, { - foreach (integer idx, list_index, + sections[idx, "__changed"] = true; + if (sections[idx, "append"]:nil != nil) { - sections[idx, "console"] = console_value; - sections[idx, "__changed"] = true; - if (sections[idx, "append"]:nil != nil) + string updated_append = ""; + if ((console_value != "") || (console_value != nil)) + updated_append = BootCommon::UpdateSerialConsole(sections[idx,"append"]:"", + console_value); + else + updated_append = BootCommon::UpdateSerialConsole(sections[idx,"append"]:"", ""); + if (updated_append != nil) { - string updated_append = - BootCommon::UpdateSerialConsole(sections[idx,"append"]:"", - sections[idx,"console"]:""); - if (updated_append != nil) - { - sections[idx,"append"]=updated_append; - } + sections[idx,"append"]=updated_append; } - y2debug("Added console for section: %1", sections[idx]:$[]); - }); - } - + } + y2debug("Added/Removed console for section: %1", sections[idx]:$[]); + }); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org