Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:12.2 checked in at 2012-07-14 13:18:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/yast2-bootloader (Old) and /work/SRC/openSUSE:12.2/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader", Maintainer is "snw...@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/yast2-bootloader/yast2-bootloader.changes 2012-07-10 13:44:51.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.yast2-bootloader.new/yast2-bootloader.changes 2012-07-14 13:18:04.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Jul 13 15:40:46 CEST 2012 - mch...@suse.com + +- support failsafe kernel parameters +- use product name in distributor +- rearrange widgets in dialog +- fix redundant kernel append +- 2.23.7 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.23.6.tar.bz2 New: ---- yast2-bootloader-2.23.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.rODFK0/_old 2012-07-14 13:18:04.000000000 +0200 +++ /var/tmp/diff_new_pack.rODFK0/_new 2012-07-14 13:18:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 2.23.6 +Version: 2.23.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-2.23.6.tar.bz2 -> yast2-bootloader-2.23.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.6/VERSION new/yast2-bootloader-2.23.7/VERSION --- old/yast2-bootloader-2.23.6/VERSION 2012-07-09 14:49:44.000000000 +0200 +++ new/yast2-bootloader-2.23.7/VERSION 2012-07-13 15:40:44.000000000 +0200 @@ -1 +1 @@ -2.23.6 +2.23.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.6/src/grub2/dialogs.ycp new/yast2-bootloader-2.23.7/src/grub2/dialogs.ycp --- old/yast2-bootloader-2.23.6/src/grub2/dialogs.ycp 2012-07-04 09:43:08.000000000 +0200 +++ new/yast2-bootloader-2.23.7/src/grub2/dialogs.ycp 2012-07-13 15:40:31.000000000 +0200 @@ -39,16 +39,23 @@ `HSpacing (2), `VBox ( `VStretch (), - `Left(`HSquash("distributor")), - `Left("activate"), - `Left("generic_mbr"), - `Left("hiddenmenu"), `HBox ( - `Left(`HSquash("timeout")), - `Left("vgamode"), + `HSquash("distributor"), + "hiddenmenu", + `HStretch () + ), + `HBox ( + "activate", + "generic_mbr", + `HStretch () + ), + `HBox ( + `HSquash("timeout"), + "vgamode", `HStretch () ), `Left("append"), + `Left("append_failsafe"), `Left("default"), `Left("console"), `Left("gfxterm"), @@ -59,8 +66,8 @@ string lt = BootCommon::getLoaderType (false); list<string> widget_names = (lt == "grub2-efi") - ? ["distributor", "hiddenmenu", "timeout", "append", "console", "default", "vgamode"] - : ["distributor", "activate","generic_mbr", "hiddenmenu", "timeout", "append", "console", "default", "vgamode"]; + ? ["distributor", "hiddenmenu", "timeout", "append", "append_failsafe", "console", "default", "vgamode"] + : ["distributor", "activate","generic_mbr", "hiddenmenu", "timeout", "append", "append_failsafe", "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.6/src/grub2/helps.ycp new/yast2-bootloader-2.23.7/src/grub2/helps.ycp --- old/yast2-bootloader-2.23.6/src/grub2/helps.ycp 2012-06-25 08:50:21.000000000 +0200 +++ new/yast2-bootloader-2.23.7/src/grub2/helps.ycp 2012-07-13 15:40:31.000000000 +0200 @@ -23,11 +23,14 @@ _("<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"), "vgamode" : _("<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"), + "append_failsafe" : + _("<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"), ]; global map<string,string> grub2_descriptions = $[ "append" : _("O&ptional Kernel Command Line Parameter"), "vgamode" : _("&Vga Mode"), + "append_failsafe" : _("&Failsafe Kernel Command Line Parameter"), ]; } //EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.6/src/grub2/options.ycp new/yast2-bootloader-2.23.7/src/grub2/options.ycp --- old/yast2-bootloader-2.23.6/src/grub2/options.ycp 2012-07-04 09:43:08.000000000 +0200 +++ new/yast2-bootloader-2.23.7/src/grub2/options.ycp 2012-07-13 15:40:31.000000000 +0200 @@ -194,6 +194,8 @@ grub_help_messages["hiddenmenu"]:""), "append" : CommonInputFieldWidget(grub2_descriptions["append"]:"append", grub2_help_messages["append"]:""), + "append_failsafe" : CommonInputFieldWidget(grub2_descriptions["append_failsafe"]:"append_failsafe", + grub2_help_messages["append_failsafe"]:""), "vgamode" : $[ "widget" : `combobox, "label" : grub2_descriptions["vgamode"]:"vgamode", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.6/src/modules/BootGRUB2.ycp new/yast2-bootloader-2.23.7/src/modules/BootGRUB2.ycp --- old/yast2-bootloader-2.23.6/src/modules/BootGRUB2.ycp 2012-07-04 09:43:08.000000000 +0200 +++ new/yast2-bootloader-2.23.7/src/modules/BootGRUB2.ycp 2012-07-13 15:40:31.000000000 +0200 @@ -35,6 +35,7 @@ import "Pkg"; import "HTML"; import "Initrd"; +import "Product"; // includes // for shared some routines with grub @@ -159,6 +160,9 @@ if ((resume != "") && (resume != nil)) resume = BootStorage::Dev2MountByDev(resume); BootCommon::globals["append"] = BootArch::DefaultKernelParams (resume); + BootCommon::globals["append_failsafe"] = BootArch::FailsafeKernelParams (); + BootCommon::globals["distributor"] = Product::name; + BootCommon::kernelCmdLine = Kernel::GetCmdLine (); // Let grub2 scripts detects correct root= for us. :) // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.6/src/modules/BootGRUB2EFI.ycp new/yast2-bootloader-2.23.7/src/modules/BootGRUB2EFI.ycp --- old/yast2-bootloader-2.23.6/src/modules/BootGRUB2EFI.ycp 2012-07-04 09:43:08.000000000 +0200 +++ new/yast2-bootloader-2.23.7/src/modules/BootGRUB2EFI.ycp 2012-07-13 15:40:31.000000000 +0200 @@ -35,6 +35,7 @@ import "Pkg"; import "HTML"; import "Initrd"; +import "Product"; // includes // for shared some routines with grub @@ -152,6 +153,9 @@ if ((resume != "") && (resume != nil)) resume = BootStorage::Dev2MountByDev(resume); BootCommon::globals["append"] = BootArch::DefaultKernelParams (resume); + BootCommon::globals["append_failsafe"] = BootArch::FailsafeKernelParams (); + BootCommon::globals["distributor"] = Product::name; + BootCommon::kernelCmdLine = Kernel::GetCmdLine (); // Let grub2 scripts detects correct root= for us. :) // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org