Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2012-07-04 13:57:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader", Maintainer is "snw...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2012-06-05 12:04:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes
2012-07-04 13:57:03.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Jul 4 09:44:00 CEST 2012 - mch...@suse.de
+
+- set leagcy grub as default for xen pv guest
+- use 'auto' for default gfxmode
+- replace background with theme
+- support editing GRUB_DISTRIBUTOR
+- make vgamode widget wider
+- 2.23.5
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.23.4.tar.bz2
New:
----
yast2-bootloader-2.23.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.RM0AdU/_old 2012-07-04 13:57:04.000000000 +0200
+++ /var/tmp/diff_new_pack.RM0AdU/_new 2012-07-04 13:57:04.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 2.23.4
+Version: 2.23.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-bootloader-2.23.4.tar.bz2 -> yast2-bootloader-2.23.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.23.4/VERSION
new/yast2-bootloader-2.23.5/VERSION
--- old/yast2-bootloader-2.23.4/VERSION 2012-06-04 15:51:13.000000000 +0200
+++ new/yast2-bootloader-2.23.5/VERSION 2012-07-04 09:43:56.000000000 +0200
@@ -1 +1 @@
-2.23.4
+2.23.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.23.4/configure
new/yast2-bootloader-2.23.5/configure
--- old/yast2-bootloader-2.23.4/configure 2012-06-04 15:52:22.000000000
+0200
+++ new/yast2-bootloader-2.23.5/configure 2012-07-04 09:35:55.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.4.
+# Generated by GNU Autoconf 2.68 for yast2-bootloader 2.23.3.
#
# 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.4'
-PACKAGE_STRING='yast2-bootloader 2.23.4'
+PACKAGE_VERSION='2.23.3'
+PACKAGE_STRING='yast2-bootloader 2.23.3'
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.4 to adapt to many kinds of
systems.
+\`configure' configures yast2-bootloader 2.23.3 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.4:";;
+ short | recursive ) echo "Configuration of yast2-bootloader 2.23.3:";;
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.4
+yast2-bootloader configure 2.23.3
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.4, which was
+It was created by yast2-bootloader $as_me 2.23.3, 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.4'
+ VERSION='2.23.3'
cat >>confdefs.h <<_ACEOF
@@ -3057,7 +3057,7 @@
-VERSION="2.23.4"
+VERSION="2.23.3"
RPMNAME="yast2-bootloader"
MAINTAINER="Steffen Winterfeldt <snw...@suse.de>"
@@ -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.4, which was
+This file was extended by yast2-bootloader $as_me 2.23.3, 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.4
+yast2-bootloader config.status 2.23.3
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.4/configure.in
new/yast2-bootloader-2.23.5/configure.in
--- old/yast2-bootloader-2.23.4/configure.in 2012-06-04 15:52:15.000000000
+0200
+++ new/yast2-bootloader-2.23.5/configure.in 2012-07-04 09:35:48.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.4, http://bugs.opensuse.org/, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.23.3, 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.4"
+VERSION="2.23.3"
RPMNAME="yast2-bootloader"
MAINTAINER="Steffen Winterfeldt <snw...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.23.4/src/grub2/dialogs.ycp
new/yast2-bootloader-2.23.5/src/grub2/dialogs.ycp
--- old/yast2-bootloader-2.23.4/src/grub2/dialogs.ycp 2012-05-23
10:31:32.000000000 +0200
+++ new/yast2-bootloader-2.23.5/src/grub2/dialogs.ycp 2012-07-04
09:43:08.000000000 +0200
@@ -39,12 +39,13 @@
`HSpacing (2),
`VBox (
`VStretch (),
+ `Left(`HSquash("distributor")),
`Left("activate"),
`Left("generic_mbr"),
`Left("hiddenmenu"),
`HBox (
`Left(`HSquash("timeout")),
- `Left(`HSquash("vgamode")),
+ `Left("vgamode"),
`HStretch ()
),
`Left("append"),
@@ -58,8 +59,8 @@
string lt = BootCommon::getLoaderType (false);
list<string> widget_names = (lt == "grub2-efi")
- ? ["hiddenmenu", "timeout", "append",
"console", "default", "vgamode"]
- : ["activate","generic_mbr", "hiddenmenu",
"timeout", "append", "console", "default", "vgamode"];
+ ? ["distributor", "hiddenmenu", "timeout",
"append", "console", "default", "vgamode"]
+ : ["distributor", "activate","generic_mbr",
"hiddenmenu", "timeout", "append", "console", "default", "vgamode"];
string caption = _("Boot Loader Options");
return CWM::ShowAndRun ($[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.23.4/src/grub2/options.ycp
new/yast2-bootloader-2.23.5/src/grub2/options.ycp
--- old/yast2-bootloader-2.23.4/src/grub2/options.ycp 2012-05-23
10:31:32.000000000 +0200
+++ new/yast2-bootloader-2.23.5/src/grub2/options.ycp 2012-07-04
09:43:08.000000000 +0200
@@ -110,14 +110,15 @@
});
+ items = prepend(items, `item(`id("auto"), _("Autodetect by grub2")));
UI::ChangeWidget(`id(`gfxmode), `Items, items);
string mode = BootCommon::globals["gfxmode"]:"";
- /* No mode pecified, use it */
+ /* there's mode specified, use it */
if (mode != "")
UI::ChangeWidget(`id(`gfxmode), `Value, mode);
- UI::ChangeWidget(`id(`gfxbackground), `Value,
BootCommon::globals["gfxbackground"]:"");
+ UI::ChangeWidget(`id(`gfxtheme), `Value,
BootCommon::globals["gfxtheme"]:"");
}
/**
@@ -155,8 +156,8 @@
if (mode != "")
BootCommon::globals["gfxmode"] = mode;
- string background = (string)UI::QueryWidget(`id(`gfxbackground), `Value);
- BootCommon::globals["gfxbackground"] = background;
+ string theme = (string)UI::QueryWidget(`id(`gfxtheme), `Value);
+ BootCommon::globals["gfxtheme"] = theme;
// FATE: #110038: Serial console
// add or remove console key with value for sections
@@ -165,17 +166,17 @@
symbol ConsoleHandle(string widget, map event){
- string backgrounds_dir = "/boot/grub2/backgrounds";
+ string theme_dir = "/boot/grub2/themes/openSUSE";
- if (SCR::Read (.target.size, backgrounds_dir) == -1) {
- backgrounds_dir = "/boot/grub2";
+ if (SCR::Read (.target.size, theme_dir) == -1) {
+ theme_dir = "/boot/grub2";
}
- string file = UI::AskForExistingFile(backgrounds_dir, "*.png *.jpg",
- _("Choose new graphical menu file"));
+ string file = UI::AskForExistingFile(theme_dir, "*.txt",
+ _("Choose new graphical theme file"));
if (file != nil){
- UI::ChangeWidget(`id(`gfxbackground),`Value, file);
+ UI::ChangeWidget(`id(`gfxtheme),`Value, file);
}
return nil;
@@ -183,6 +184,8 @@
map<string,map<string,any> > Grub2Options(){
map<string,map<string,any> > grub2_specific = $[
+ "distributor" :
CommonInputFieldWidget(grub2_descriptions["distributor"]:"Distributor",
+ grub2_help_messages["distributor"]:""),
"activate" : CommonCheckboxWidget(grub_descriptions["activate"]:"activate",
grub_help_messages["activate"]:""),
"generic_mbr" :
CommonCheckboxWidget(grub_descriptions["generic_mbr"]:"generic mbr",
@@ -216,7 +219,7 @@
`HBox(
`HSpacing(2),
`ComboBox(`id(`gfxmode),`opt(`editable, `hstretch), _("&Console
resolution"), [""]),
- `HBox(`Left(`InputField(`id(`gfxbackground),`opt(`hstretch),
_("&Console background"))),
+ `HBox(`Left(`InputField(`id(`gfxtheme),`opt(`hstretch),
_("&Console theme"))),
`VBox(
`Left(`Label("")),
`Left(`PushButton(`id(`browsegfx),`opt(`notify),
Label::BrowseButton())))),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.23.4/src/modules/BootCommon.ycp
new/yast2-bootloader-2.23.5/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.23.4/src/modules/BootCommon.ycp 2012-05-23
10:28:52.000000000 +0200
+++ new/yast2-bootloader-2.23.5/src/modules/BootCommon.ycp 2012-07-04
09:43:08.000000000 +0200
@@ -1055,6 +1055,11 @@
// bnc #380982 - pygrub cannot boot kernel
// added installation of bootloader
y2milestone ("It is XEN domU and the bootloader should be installed");
+ // bnc #766283 - opensuse 12.2 pv guests can not start after
installation
+ // due to lack of grub2 support in the host
+ // fallback to use grub until grub2 really works on it
+ if (loader_type == "grub2")
+ loader_type = "grub";
}
if ((Arch::i386() || Arch::x86_64()) && Linuxrc::InstallInf("EFI") == "1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.23.4/src/modules/BootGRUB2.ycp
new/yast2-bootloader-2.23.5/src/modules/BootGRUB2.ycp
--- old/yast2-bootloader-2.23.4/src/modules/BootGRUB2.ycp 2012-05-23
10:31:32.000000000 +0200
+++ new/yast2-bootloader-2.23.5/src/modules/BootGRUB2.ycp 2012-07-04
09:43:08.000000000 +0200
@@ -51,7 +51,7 @@
"timeout" : "8",
"default" : "0",
"vgamode" : "",
- "gfxmode" : "",
+ "gfxmode" : "auto",
"terminal" : "gfxterm",
];
}
@@ -169,32 +169,6 @@
//{
// 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.4/src/modules/BootGRUB2EFI.ycp
new/yast2-bootloader-2.23.5/src/modules/BootGRUB2EFI.ycp
--- old/yast2-bootloader-2.23.4/src/modules/BootGRUB2EFI.ycp 2012-05-23
10:31:32.000000000 +0200
+++ new/yast2-bootloader-2.23.5/src/modules/BootGRUB2EFI.ycp 2012-07-04
09:43:08.000000000 +0200
@@ -51,7 +51,7 @@
"timeout" : "8",
"default" : "0",
"vgamode" : "",
- "gfxmode" : "",
+ "gfxmode" : "auto",
"terminal" : "gfxterm",
];
}
@@ -162,31 +162,6 @@
//{
// 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);
- }
}
/**
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
