Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2012-06-05 12:03:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2012-05-07 22:53:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2012-06-05 12:04:01.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 4 15:51:19 CEST 2012 - [email protected] + +- support console related global options gfxterm, serial, gfxbackground + and gfxmode +- 2.23.4 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.23.3.tar.bz2 New: ---- yast2-bootloader-2.23.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.8tvLko/_old 2012-06-05 12:04:02.000000000 +0200 +++ /var/tmp/diff_new_pack.8tvLko/_new 2012-06-05 12:04:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 2.23.3 +Version: 2.23.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-2.23.3.tar.bz2 -> yast2-bootloader-2.23.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/VERSION new/yast2-bootloader-2.23.4/VERSION --- old/yast2-bootloader-2.23.3/VERSION 2012-04-24 15:06:13.000000000 +0200 +++ new/yast2-bootloader-2.23.4/VERSION 2012-06-04 15:51:13.000000000 +0200 @@ -1 +1 @@ -2.23.3 +2.23.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/agents/bootloader.scr new/yast2-bootloader-2.23.4/agents/bootloader.scr --- old/yast2-bootloader-2.23.3/agents/bootloader.scr 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/agents/bootloader.scr 2012-05-23 10:28:52.000000000 +0200 @@ -10,7 +10,7 @@ * See: * libscr * - * $Id: bootloader.scr 27748 2006-02-08 15:15:11Z jplack $ + * $Id$ * */ .bootloader diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/agents/cfg_bootloader.scr new/yast2-bootloader-2.23.4/agents/cfg_bootloader.scr --- old/yast2-bootloader-2.23.3/agents/cfg_bootloader.scr 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/agents/cfg_bootloader.scr 2012-05-23 10:28:52.000000000 +0200 @@ -5,7 +5,7 @@ * SCR Agent for reading/writing /etc/sysconfig/bootloader * using the sysconfig-agent * - * $Id: cfg_bootloader.scr 12859 2003-11-28 10:17:50Z jsrain $ + * $Id$ * * Read/Sets the values defined in <tt>/etc/sysconfig/bootloader</tt> * in an easy manner. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/agents/cfg_bootsplash.scr new/yast2-bootloader-2.23.4/agents/cfg_bootsplash.scr --- old/yast2-bootloader-2.23.3/agents/cfg_bootsplash.scr 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/agents/cfg_bootsplash.scr 2012-05-23 10:28:52.000000000 +0200 @@ -5,7 +5,7 @@ * SCR Agent for reading/writing /etc/sysconfig/bootsplash * using the sysconfig-agent * - * $Id: cfg_bootsplash.scr 16106 2004-03-12 13:11:43Z jsrain $ + * $Id$ * * Read/Sets the values defined in <tt>/etc/sysconfig/bootsplash</tt> * in an easy manner. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/configure new/yast2-bootloader-2.23.4/configure --- old/yast2-bootloader-2.23.3/configure 2012-03-05 15:09:51.000000000 +0100 +++ new/yast2-bootloader-2.23.4/configure 2012-06-04 15:52:22.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-bootloader 2.23.0. +# Generated by GNU Autoconf 2.68 for yast2-bootloader 2.23.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='yast2-bootloader' PACKAGE_TARNAME='yast2-bootloader' -PACKAGE_VERSION='2.23.0' -PACKAGE_STRING='yast2-bootloader 2.23.0' +PACKAGE_VERSION='2.23.4' +PACKAGE_STRING='yast2-bootloader 2.23.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1364,7 +1364,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-bootloader 2.23.0 to adapt to many kinds of systems. +\`configure' configures yast2-bootloader 2.23.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1436,7 +1436,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-bootloader 2.23.0:";; + short | recursive ) echo "Configuration of yast2-bootloader 2.23.4:";; esac cat <<\_ACEOF @@ -1552,7 +1552,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-bootloader configure 2.23.0 +yast2-bootloader configure 2.23.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2005,7 +2005,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-bootloader $as_me 2.23.0, which was +It was created by yast2-bootloader $as_me 2.23.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2935,7 +2935,7 @@ # Define the identity of the package. PACKAGE='yast2-bootloader' - VERSION='2.23.0' + VERSION='2.23.4' cat >>confdefs.h <<_ACEOF @@ -3057,7 +3057,7 @@ -VERSION="2.23.0" +VERSION="2.23.4" RPMNAME="yast2-bootloader" MAINTAINER="Steffen Winterfeldt <[email protected]>" @@ -16695,7 +16695,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-bootloader $as_me 2.23.0, which was +This file was extended by yast2-bootloader $as_me 2.23.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16761,7 +16761,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-bootloader config.status 2.23.0 +yast2-bootloader config.status 2.23.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/configure.in new/yast2-bootloader-2.23.4/configure.in --- old/yast2-bootloader-2.23.3/configure.in 2012-03-05 15:09:45.000000000 +0100 +++ new/yast2-bootloader-2.23.4/configure.in 2012-06-04 15:52:15.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.23.0, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.23.4, http://bugs.opensuse.org/, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.0" +VERSION="2.23.4" RPMNAME="yast2-bootloader" MAINTAINER="Steffen Winterfeldt <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/clients/bootloader.ycp new/yast2-bootloader-2.23.4/src/clients/bootloader.ycp --- old/yast2-bootloader-2.23.3/src/clients/bootloader.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/clients/bootloader.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: bootloader.ycp 58289 2009-08-06 11:50:12Z juhliarik $ + * $Id$ * */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/clients/bootloader_auto.ycp new/yast2-bootloader-2.23.4/src/clients/bootloader_auto.ycp --- old/yast2-bootloader-2.23.3/src/clients/bootloader_auto.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/clients/bootloader_auto.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: bootloader_auto.ycp 24249 2005-07-22 08:18:24Z jsrain $ + * $Id$ * */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.23.4/src/clients/bootloader_finish.ycp --- old/yast2-bootloader-2.23.3/src/clients/bootloader_finish.ycp 2012-04-23 11:33:44.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/clients/bootloader_finish.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -9,7 +9,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: bootloader_finish.ycp 67934 2012-04-13 13:36:57Z aschnell $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/clients/bootloader_proposal.ycp new/yast2-bootloader-2.23.4/src/clients/bootloader_proposal.ycp --- old/yast2-bootloader-2.23.3/src/clients/bootloader_proposal.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/clients/bootloader_proposal.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -1,7 +1,7 @@ /** * Module: bootloader_proposal.ycp * - * $Id: bootloader_proposal.ycp 67178 2012-01-13 10:33:35Z jsuchome $ + * $Id$ * * Author: Klaus Kaempf <[email protected]> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/clients/print-product.ycp new/yast2-bootloader-2.23.4/src/clients/print-product.ycp --- old/yast2-bootloader-2.23.3/src/clients/print-product.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/clients/print-product.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Stefan Fent <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: print-product.ycp 30071 2006-04-12 15:36:51Z odabrunz $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/elilo/helps.ycp new/yast2-bootloader-2.23.4/src/elilo/helps.ycp --- old/yast2-bootloader-2.23.3/src/elilo/helps.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/elilo/helps.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Joachim Plack <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: helps.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/elilo/widgets.ycp new/yast2-bootloader-2.23.4/src/elilo/widgets.ycp --- old/yast2-bootloader-2.23.3/src/elilo/widgets.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/elilo/widgets.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: widgets.ycp 56563 2009-04-02 08:41:25Z jreidinger $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/grub/helps.ycp new/yast2-bootloader-2.23.4/src/grub/helps.ycp --- old/yast2-bootloader-2.23.3/src/grub/helps.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/grub/helps.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Joachim Plack <[email protected]> * - * $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/grub/misc.ycp new/yast2-bootloader-2.23.4/src/grub/misc.ycp --- old/yast2-bootloader-2.23.3/src/grub/misc.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/grub/misc.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: misc.ycp 61449 2010-03-23 09:56:57Z juhliarik $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/grub2/Makefile.in new/yast2-bootloader-2.23.4/src/grub2/Makefile.in --- old/yast2-bootloader-2.23.3/src/grub2/Makefile.in 2012-04-23 11:44:51.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/grub2/Makefile.in 2012-06-04 15:52:23.000000000 +0200 @@ -246,9 +246,9 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@/bootloader/grub2 ystartupdir = @ystartupdir@ -ynclude_DATA = \ - dialogs.ycp \ - options.ycp \ +ynclude_DATA = \ + dialogs.ycp \ + options.ycp \ helps.ycp EXTRA_DIST = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/grub2/dialogs.ycp new/yast2-bootloader-2.23.4/src/grub2/dialogs.ycp --- old/yast2-bootloader-2.23.3/src/grub2/dialogs.ycp 2012-04-23 11:49:07.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/grub2/dialogs.ycp 2012-05-23 10:31:32.000000000 +0200 @@ -44,11 +44,13 @@ `Left("hiddenmenu"), `HBox ( `Left(`HSquash("timeout")), - `Left(`HWeight(1, "vgamode")) + `Left(`HSquash("vgamode")), + `HStretch () ), `Left("append"), `Left("default"), `Left("console"), + `Left("gfxterm"), `VStretch () ), `HSpacing (2) @@ -56,7 +58,7 @@ string lt = BootCommon::getLoaderType (false); list<string> widget_names = (lt == "grub2-efi") - ? ["hiddenmenu", "timeout", "append", "default", "vgamode"] + ? ["hiddenmenu", "timeout", "append", "console", "default", "vgamode"] : ["activate","generic_mbr", "hiddenmenu", "timeout", "append", "console", "default", "vgamode"]; string caption = _("Boot Loader Options"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/grub2/options.ycp new/yast2-bootloader-2.23.4/src/grub2/options.ycp --- old/yast2-bootloader-2.23.3/src/grub2/options.ycp 2012-04-23 11:46:59.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/grub2/options.ycp 2012-05-23 10:31:32.000000000 +0200 @@ -26,12 +26,18 @@ include "bootloader/grub/helps.ycp"; include "bootloader/grub2/helps.ycp"; +list<map> vga_modes = []; + /** * Init function of widget * @param widget any id of the widget */ void VgaModeInit (string widget) { - list<map> vga_modes = Initrd::VgaModes (); + + if ( size(vga_modes) == 0) { + vga_modes = Initrd::VgaModes (); + } + list items = maplist (map m, vga_modes, { return `item (`id (sformat ("%1", tohexstring(m["mode"]:0))), // combo box item @@ -72,6 +78,46 @@ UI::ChangeWidget(`id(`console_frame),`Value, enable); string args = BootCommon::globals["serial"]:""; UI::ChangeWidget(`id(`console_args),`Value, args); + + enable = BootCommon::globals["terminal"]:"" == "gfxterm"; + UI::ChangeWidget(`id(`gfxterm_frame),`Value, enable); + + if ( size(vga_modes) == 0) { + vga_modes = Initrd::VgaModes (); + } + + list<map> vga_modes_sort = sort (map a, map b, vga_modes, { + if (a["width"]:0 == b["width"]:0) + return (a["height"]:0 > b["height"]:0); + return (a["width"]:0 > b["width"]:0); + }); + + integer width = 0; + integer height = 0; + vga_modes_sort = filter ( map m , vga_modes_sort, ``{ + boolean ret = false; + if (width != m["width"]:0 || height != m["height"]:0) { + ret = true; + } + width = m["width"]:0; + height = m["height"]:0; + return ret; + }); + + list items = maplist (map m, vga_modes_sort, ``{ + string mode = sformat ("%1x%2", m["width"]:0, m["height"]:0); + return `item (`id (mode), mode); + }); + + + UI::ChangeWidget(`id(`gfxmode), `Items, items); + string mode = BootCommon::globals["gfxmode"]:""; + + /* No mode pecified, use it */ + if (mode != "") + UI::ChangeWidget(`id(`gfxmode), `Value, mode); + + UI::ChangeWidget(`id(`gfxbackground), `Value, BootCommon::globals["gfxbackground"]:""); } /** @@ -81,6 +127,14 @@ */ void ConsoleStore(string widget, map event){ boolean use_serial = (boolean) UI::QueryWidget(`id(`console_frame),`Value); + boolean use_gfxterm = (boolean) UI::QueryWidget(`id(`gfxterm_frame),`Value); + + if (use_gfxterm && use_serial) { + use_gfxterm = false; + } else if (!use_gfxterm && !use_serial) { + BootCommon::globals["terminal"] = "console"; + } + if (use_serial) { BootCommon::globals["terminal"] = "serial"; @@ -88,17 +142,45 @@ 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"); } + if (use_gfxterm) + { + BootCommon::globals["terminal"] = "gfxterm"; + } + + string mode = (string)UI::QueryWidget(`id(`gfxmode),`Value); + if (mode != "") + BootCommon::globals["gfxmode"] = mode; + + string background = (string)UI::QueryWidget(`id(`gfxbackground), `Value); + BootCommon::globals["gfxbackground"] = background; + // FATE: #110038: Serial console // add or remove console key with value for sections BootCommon::HandleConsole2(); } +symbol ConsoleHandle(string widget, map event){ + + string backgrounds_dir = "/boot/grub2/backgrounds"; + + if (SCR::Read (.target.size, backgrounds_dir) == -1) { + backgrounds_dir = "/boot/grub2"; + } + + string file = UI::AskForExistingFile(backgrounds_dir, "*.png *.jpg", + _("Choose new graphical menu file")); + + if (file != nil){ + UI::ChangeWidget(`id(`gfxbackground),`Value, file); + } + + return nil; +} + map<string,map<string,any> > Grub2Options(){ map<string,map<string,any> > grub2_specific = $[ "activate" : CommonCheckboxWidget(grub_descriptions["activate"]:"activate", @@ -129,7 +211,16 @@ "console" : $[ "widget" : `custom, - "custom_widget" : `HBox( + "custom_widget" : `VBox( + `CheckBoxFrame(`id(`gfxterm_frame),_("Use &graphical console"),true, + `HBox( + `HSpacing(2), + `ComboBox(`id(`gfxmode),`opt(`editable, `hstretch), _("&Console resolution"), [""]), + `HBox(`Left(`InputField(`id(`gfxbackground),`opt(`hstretch), _("&Console background"))), + `VBox( + `Left(`Label("")), + `Left(`PushButton(`id(`browsegfx),`opt(`notify), Label::BrowseButton())))), + `HStretch())), `CheckBoxFrame(`id(`console_frame),_("Use &serial console"),true, `HBox( `HSpacing(2), @@ -138,6 +229,8 @@ ), "init" : ConsoleInit, "store" : ConsoleStore, + "handle" : ConsoleHandle, + "handle_events" : [`browsegfx], "help" : grub_help_messages["serial"]:"" ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootArch.ycp new/yast2-bootloader-2.23.4/src/modules/BootArch.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootArch.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/modules/BootArch.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -14,7 +14,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: BootArch.ycp 65885 2011-09-21 09:56:15Z snwint $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootCommon.ycp new/yast2-bootloader-2.23.4/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootCommon.ycp 2012-03-30 13:02:55.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/modules/BootCommon.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -15,7 +15,7 @@ * Joachim Plack <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: BootCommon.ycp 67833 2012-03-30 11:02:53Z snwint $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootELILO.ycp new/yast2-bootloader-2.23.4/src/modules/BootELILO.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootELILO.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/modules/BootELILO.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -17,7 +17,7 @@ * Olaf Dabrunz <[email protected]> * Philipp Thomas <[email protected]> * - * $Id: BootELILO.ycp 61352 2010-03-16 16:33:37Z juhliarik $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootGRUB.ycp new/yast2-bootloader-2.23.4/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootGRUB.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/modules/BootGRUB.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -15,7 +15,7 @@ * Olaf Dabrunz <[email protected]> * Philipp Thomas <[email protected]> * - * $Id: BootGRUB.ycp 63508 2011-03-04 12:53:27Z jreidinger $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootGRUB2.ycp new/yast2-bootloader-2.23.4/src/modules/BootGRUB2.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootGRUB2.ycp 2012-04-23 11:44:51.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/modules/BootGRUB2.ycp 2012-05-23 10:31:32.000000000 +0200 @@ -34,6 +34,7 @@ import "StorageDevices"; import "Pkg"; import "HTML"; +import "Initrd"; // includes // for shared some routines with grub @@ -49,6 +50,9 @@ return $[ "timeout" : "8", "default" : "0", + "vgamode" : "", + "gfxmode" : "", + "terminal" : "gfxterm", ]; } @@ -158,10 +162,39 @@ // Let grub2 scripts detects correct root= for us. :) // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); - if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") - { - BootCommon::globals["vgamode"] = Kernel::GetVgaType (); + + // We don't set vga= if Grub2 gfxterm enabled, because the modesettings + // will be delivered to kernel by Grub2's gfxpayload set to "keep" + //if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") + //{ + // BootCommon::globals["vgamode"] = Kernel::GetVgaType (); + //} + + list<map> vga_modes = Initrd::VgaModes (); + + integer max_width = 0; + integer max_height = 0; + + foreach (map m, vga_modes, { + + integer width = m["width"]:0; + integer height = m["height"]:0; + + if (width > max_width) { + max_width = width; + max_height = height; + } else if (width == max_width && height > max_height) { + max_height = height; + } + }); + + if (max_width != 0) { + string mode = sformat ("%1x%2", max_width, max_height); + + BootCommon::globals["gfxmode"] = mode; + BootCommon::globals["gfxbackground"] = sformat ("/boot/grub2/backgrounds/default-%1.png", mode); } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootGRUB2EFI.ycp new/yast2-bootloader-2.23.4/src/modules/BootGRUB2EFI.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootGRUB2EFI.ycp 2012-04-23 11:49:07.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/modules/BootGRUB2EFI.ycp 2012-05-23 10:31:32.000000000 +0200 @@ -34,6 +34,7 @@ import "StorageDevices"; import "Pkg"; import "HTML"; +import "Initrd"; // includes // for shared some routines with grub @@ -49,6 +50,9 @@ return $[ "timeout" : "8", "default" : "0", + "vgamode" : "", + "gfxmode" : "", + "terminal" : "gfxterm", ]; } @@ -151,9 +155,37 @@ // Let grub2 scripts detects correct root= for us. :) // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); - if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") - { - BootCommon::globals["vgamode"] = Kernel::GetVgaType (); + + // We don't set vga= if Grub2 gfxterm enabled, because the modesettings + // will be delivered to kernel by Grub2's gfxpayload set to "keep" + //if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") + //{ + // BootCommon::globals["vgamode"] = Kernel::GetVgaType (); + //} + + list<map> vga_modes = Initrd::VgaModes (); + + integer max_width = 0; + integer max_height = 0; + + foreach (map m, vga_modes, { + + integer width = m["width"]:0; + integer height = m["height"]:0; + + if (width > max_width) { + max_width = width; + max_height = height; + } else if (width == max_width && height > max_height) { + max_height = height; + } + }); + + if (max_width != 0) { + string mode = sformat ("%1x%2", max_width, max_height); + + BootCommon::globals["gfxmode"] = mode; + BootCommon::globals["gfxbackground"] = sformat ("/boot/grub2/backgrounds/default-%1.png", mode); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootLILO.ycp new/yast2-bootloader-2.23.4/src/modules/BootLILO.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootLILO.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/modules/BootLILO.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -14,7 +14,7 @@ * Olaf Dabrunz <[email protected]> * Philipp Thomas <[email protected]> * - * $Id: BootLILO.ycp 57310 2009-05-25 14:24:53Z jreidinger $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.23.4/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootPOWERLILO.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/modules/BootPOWERLILO.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -15,7 +15,7 @@ * Olaf Dabrunz <[email protected]> * Philipp Thomas <[email protected]> * - * $Id: BootPOWERLILO.ycp 59966 2009-12-04 15:16:44Z juhliarik $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/BootZIPL.ycp new/yast2-bootloader-2.23.4/src/modules/BootZIPL.ycp --- old/yast2-bootloader-2.23.3/src/modules/BootZIPL.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/modules/BootZIPL.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -14,7 +14,7 @@ * Jiri Srain <[email protected]> * Philipp Thomas <[email protected]> * - * $Id: BootZIPL.ycp 66485 2011-10-18 14:30:01Z snwint $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/Bootloader.ycp new/yast2-bootloader-2.23.4/src/modules/Bootloader.ycp --- old/yast2-bootloader-2.23.3/src/modules/Bootloader.ycp 2012-04-30 11:10:06.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/modules/Bootloader.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: Bootloader.ycp 68045 2012-04-30 09:10:05Z snwint $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/modules/GfxMenu.ycp new/yast2-bootloader-2.23.4/src/modules/GfxMenu.ycp --- old/yast2-bootloader-2.23.3/src/modules/GfxMenu.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/modules/GfxMenu.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: GfxMenu.ycp 58175 2009-07-27 14:52:21Z juhliarik $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/ppc/helps.ycp new/yast2-bootloader-2.23.4/src/ppc/helps.ycp --- old/yast2-bootloader-2.23.3/src/ppc/helps.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/ppc/helps.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Joachim Plack <[email protected]> * - * $Id: helps.ycp 58671 2009-09-17 10:44:34Z juhliarik $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/autoinstall.ycp new/yast2-bootloader-2.23.4/src/routines/autoinstall.ycp --- old/yast2-bootloader-2.23.3/src/routines/autoinstall.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/autoinstall.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: autoinstall.ycp 57000 2009-04-27 15:10:59Z juhliarik $ + * $Id$ * */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/common_helps.ycp new/yast2-bootloader-2.23.4/src/routines/common_helps.ycp --- old/yast2-bootloader-2.23.3/src/routines/common_helps.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/common_helps.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Joachim Plack <[email protected]> * - * $Id: common_helps.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/dialogs.ycp new/yast2-bootloader-2.23.4/src/routines/dialogs.ycp --- old/yast2-bootloader-2.23.3/src/routines/dialogs.ycp 2012-03-30 13:02:55.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/routines/dialogs.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: dialogs.ycp 67833 2012-03-30 11:02:53Z snwint $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/global_widgets.ycp new/yast2-bootloader-2.23.4/src/routines/global_widgets.ycp --- old/yast2-bootloader-2.23.3/src/routines/global_widgets.ycp 2012-04-23 11:50:13.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/routines/global_widgets.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: global_widgets.ycp 67986 2012-04-23 09:50:12Z snwint $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/helps.ycp new/yast2-bootloader-2.23.4/src/routines/helps.ycp --- old/yast2-bootloader-2.23.3/src/routines/helps.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/helps.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: helps.ycp 58490 2009-09-03 11:28:17Z juhliarik $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/i386.ycp new/yast2-bootloader-2.23.4/src/routines/i386.ycp --- old/yast2-bootloader-2.23.3/src/routines/i386.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/i386.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: i386.ycp 57010 2009-04-28 14:39:07Z juhliarik $ + * $Id$ * */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/lib_iface.ycp new/yast2-bootloader-2.23.4/src/routines/lib_iface.ycp --- old/yast2-bootloader-2.23.3/src/routines/lib_iface.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/lib_iface.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: lib_iface.ycp 56945 2009-04-23 14:48:09Z juhliarik $ + * $Id$ * * WARNING: * To be included to BootCommon.ycp only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/lilolike.ycp new/yast2-bootloader-2.23.4/src/routines/lilolike.ycp --- old/yast2-bootloader-2.23.3/src/routines/lilolike.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/lilolike.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: lilolike.ycp 62030 2010-05-19 07:58:43Z juhliarik $ + * $Id$ * */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/misc.ycp new/yast2-bootloader-2.23.4/src/routines/misc.ycp --- old/yast2-bootloader-2.23.3/src/routines/misc.ycp 2012-04-23 11:48:42.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/routines/misc.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: misc.ycp 67985 2012-04-23 09:48:41Z snwint $ + * $Id$ * * WARNING: * To be included to BootCommon.ycp only, requires function diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/popups.ycp new/yast2-bootloader-2.23.4/src/routines/popups.ycp --- old/yast2-bootloader-2.23.3/src/routines/popups.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/popups.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: popups.ycp 56824 2009-04-16 15:20:53Z juhliarik $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/section_helps.ycp new/yast2-bootloader-2.23.4/src/routines/section_helps.ycp --- old/yast2-bootloader-2.23.3/src/routines/section_helps.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/section_helps.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Josef Reidinger <[email protected]> * - * $Id: section_helps.ycp 62540 2010-10-06 11:14:38Z jreidinger $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/section_widgets.ycp new/yast2-bootloader-2.23.4/src/routines/section_widgets.ycp --- old/yast2-bootloader-2.23.3/src/routines/section_widgets.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/section_widgets.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -13,7 +13,7 @@ * Olaf Dabrunz <[email protected]> * Josef Reidinger <[email protected]> * - * $Id: section_widgets.ycp 62541 2010-10-06 12:03:09Z jreidinger $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/switcher.ycp new/yast2-bootloader-2.23.4/src/routines/switcher.ycp --- old/yast2-bootloader-2.23.3/src/routines/switcher.ycp 2012-03-30 13:02:55.000000000 +0200 +++ new/yast2-bootloader-2.23.4/src/routines/switcher.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <[email protected]> * Olaf Dabrunz <[email protected]> * - * $Id: switcher.ycp 67833 2012-03-30 11:02:53Z snwint $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/routines/wizards.ycp new/yast2-bootloader-2.23.4/src/routines/wizards.ycp --- old/yast2-bootloader-2.23.3/src/routines/wizards.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/routines/wizards.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: wizards.ycp 66037 2011-09-26 10:55:58Z visnov $ + * $Id$ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.3/src/zipl/helps.ycp new/yast2-bootloader-2.23.4/src/zipl/helps.ycp --- old/yast2-bootloader-2.23.3/src/zipl/helps.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.4/src/zipl/helps.ycp 2012-05-23 10:28:52.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Joachim Plack <[email protected]> * - * $Id: helps.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id$ * */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
