Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-07-01 07:05:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-06-26 08:00:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-07-01 07:05:24.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 27 12:27:05 UTC 2014 - jreidinger@suse.com + +- properly install needed packages in autoinstallation +- 3.1.59 + +------------------------------------------------------------------- +Thu Jun 26 10:50:28 UTC 2014 - jreidinger@suse.com + +- add help and translation for grub2 distributor description and + other small localization improvements (bnc#884344) +- fix crash during propose of EFI during upgrade (bnc#884397) +- 3.1.58 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.57.tar.bz2 New: ---- yast2-bootloader-3.1.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.R5sGOe/_old 2014-07-01 07:05:24.000000000 +0200 +++ /var/tmp/diff_new_pack.R5sGOe/_new 2014-07-01 07:05:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.57 +Version: 3.1.59 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.57.tar.bz2 -> yast2-bootloader-3.1.59.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.57/package/yast2-bootloader.changes new/yast2-bootloader-3.1.59/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.57/package/yast2-bootloader.changes 2014-06-24 17:28:23.000000000 +0200 +++ new/yast2-bootloader-3.1.59/package/yast2-bootloader.changes 2014-06-27 14:38:21.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri Jun 27 12:27:05 UTC 2014 - jreidinger@suse.com + +- properly install needed packages in autoinstallation +- 3.1.59 + +------------------------------------------------------------------- +Thu Jun 26 10:50:28 UTC 2014 - jreidinger@suse.com + +- add help and translation for grub2 distributor description and + other small localization improvements (bnc#884344) +- fix crash during propose of EFI during upgrade (bnc#884397) +- 3.1.58 + +------------------------------------------------------------------- Tue Jun 24 15:10:21 UTC 2014 - jreidinger@suse.com - respect product default configuration for os-prober enablement diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.57/package/yast2-bootloader.spec new/yast2-bootloader-3.1.59/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.57/package/yast2-bootloader.spec 2014-06-24 17:28:23.000000000 +0200 +++ new/yast2-bootloader-3.1.59/package/yast2-bootloader.spec 2014-06-27 14:38:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.57 +Version: 3.1.59 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.57/src/include/bootloader/grub2/dialogs.rb new/yast2-bootloader-3.1.59/src/include/bootloader/grub2/dialogs.rb --- old/yast2-bootloader-3.1.57/src/include/bootloader/grub2/dialogs.rb 2014-06-24 17:28:23.000000000 +0200 +++ new/yast2-bootloader-3.1.59/src/include/bootloader/grub2/dialogs.rb 2014-06-27 14:38:21.000000000 +0200 @@ -53,6 +53,7 @@ { "id" => "boot_code_tab", + # Title in tab "header" => _("Boot Code Options"), # if name is not included, that it is not displayed "widget_names" => widget_names, @@ -77,6 +78,7 @@ { "id" => "kernel_tab", + # Title in tab "header" => _("Kernel Parameters"), "widget_names" => widgets, "contents" => VBox( @@ -96,6 +98,7 @@ { "id" => "bootloader_tab", + # Title in tab "header" => _("Bootloader Options"), "widget_names" => widgets, "contents" => VBox( @@ -136,6 +139,7 @@ }) widgets["tab"] = tab_widget + # Window title caption = _("Boot Loader Options") CWM.ShowAndRun( { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.57/src/include/bootloader/grub2/helps.rb new/yast2-bootloader-3.1.59/src/include/bootloader/grub2/helps.rb --- old/yast2-bootloader-3.1.57/src/include/bootloader/grub2/helps.rb 2014-06-24 17:28:23.000000000 +0200 +++ new/yast2-bootloader-3.1.59/src/include/bootloader/grub2/helps.rb 2014-06-27 14:38:21.000000000 +0200 @@ -34,15 +34,19 @@ ), "pmbr" => _( "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>" + ), + "distribution" => _( + "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>" ) } @grub2_descriptions = { "append" => _("O&ptional Kernel Command Line Parameter"), + "distributor" => _("D&istributor"), "vgamode" => _("&Vga Mode"), "append_failsafe" => _("&Failsafe Kernel Command Line Parameter"), "os_prober" => _("Probe Foreign OS"), - "pmbr" => _("Protective MBR flag") + "pmbr" => _("Protective MBR flag") } end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.57/src/include/bootloader/routines/autoinstall.rb new/yast2-bootloader-3.1.59/src/include/bootloader/routines/autoinstall.rb --- old/yast2-bootloader-3.1.57/src/include/bootloader/routines/autoinstall.rb 2014-06-24 17:28:23.000000000 +0200 +++ new/yast2-bootloader-3.1.59/src/include/bootloader/routines/autoinstall.rb 2014-06-27 14:38:21.000000000 +0200 @@ -102,6 +102,7 @@ # </sections> # </bootloader> # ------------------------------------------------- + textdomain "bootloader" Yast.import "Bootloader" Yast.import "BootStorage" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.57/src/modules/BootGRUB2EFI.rb new/yast2-bootloader-3.1.59/src/modules/BootGRUB2EFI.rb --- old/yast2-bootloader-3.1.57/src/modules/BootGRUB2EFI.rb 2014-06-24 17:28:23.000000000 +0200 +++ new/yast2-bootloader-3.1.59/src/modules/BootGRUB2EFI.rb 2014-06-27 14:38:21.000000000 +0200 @@ -49,7 +49,12 @@ def Write ret = BootCommon.UpdateBootloader - BootCommon.location_changed = true if @orig_globals["distributor"] != BootCommon.globals["distributor"] + # we do not have originals or it changed + if !@orig_globals || + @orig_globals["distributor"] != BootCommon.globals["distributor"] + BootCommon.location_changed = true + end + if BootCommon.location_changed grub_ret = BootCommon.InitializeBootloader grub_ret = false if grub_ret == nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.57/src/modules/Bootloader.rb new/yast2-bootloader-3.1.59/src/modules/Bootloader.rb --- old/yast2-bootloader-3.1.57/src/modules/Bootloader.rb 2014-06-24 17:28:23.000000000 +0200 +++ new/yast2-bootloader-3.1.59/src/modules/Bootloader.rb 2014-06-27 14:38:21.000000000 +0200 @@ -128,12 +128,13 @@ BootCommon.changed = true BootCommon.location_changed = true - if Ops.get(settings, "loader_type") == "" - Ops.set(settings, "loader_type", nil) + if settings["loader_type"] == "" + settings["loader_type"] = nil end - loader_type = Ops.get_string(settings, "loader_type") + # if bootloader is not set, then propose it + loader_type = settings["loader_type"] || BootCommon.getLoaderType(true) + # Explitelly set it to ensure it is installed BootCommon.setLoaderType(loader_type) - BootCommon.getLoaderType(false) if !(loader_type == "grub") # import loader_device and selected_location only for bootloaders -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org