Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-06-26 08:00:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-18 10:59:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-06-26 08:00:48.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jun 24 15:10:21 UTC 2014 - jreidinger@suse.com + +- respect product default configuration for os-prober enablement + (bnc#884007) +- 3.1.57 + +------------------------------------------------------------------- +Wed Jun 18 14:25:19 CEST 2014 - schubi@suse.de + +- Initialize variable correctly for supported bootloaders + (bnc#883040) +- 3.1.56 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.55.tar.bz2 New: ---- yast2-bootloader-3.1.57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.yrsG63/_old 2014-06-26 08:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.yrsG63/_new 2014-06-26 08:00:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.55 +Version: 3.1.57 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.55.tar.bz2 -> yast2-bootloader-3.1.57.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.55/package/yast2-bootloader.changes new/yast2-bootloader-3.1.57/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.55/package/yast2-bootloader.changes 2014-06-16 13:23:49.000000000 +0200 +++ new/yast2-bootloader-3.1.57/package/yast2-bootloader.changes 2014-06-24 17:28:23.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Jun 24 15:10:21 UTC 2014 - jreidinger@suse.com + +- respect product default configuration for os-prober enablement + (bnc#884007) +- 3.1.57 + +------------------------------------------------------------------- +Wed Jun 18 14:25:19 CEST 2014 - schubi@suse.de + +- Initialize variable correctly for supported bootloaders + (bnc#883040) +- 3.1.56 + +------------------------------------------------------------------- Mon Jun 16 09:22:43 UTC 2014 - jreidinger@suse.com - Allow in autoyast only supported bootloaders (bnc#882210) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.55/package/yast2-bootloader.spec new/yast2-bootloader-3.1.57/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.55/package/yast2-bootloader.spec 2014-06-16 13:23:49.000000000 +0200 +++ new/yast2-bootloader-3.1.57/package/yast2-bootloader.spec 2014-06-24 17:28:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.55 +Version: 3.1.57 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.55/src/include/bootloader/routines/autoinstall.rb new/yast2-bootloader-3.1.57/src/include/bootloader/routines/autoinstall.rb --- old/yast2-bootloader-3.1.55/src/include/bootloader/routines/autoinstall.rb 2014-06-16 13:23:49.000000000 +0200 +++ new/yast2-bootloader-3.1.57/src/include/bootloader/routines/autoinstall.rb 2014-06-24 17:28:23.000000000 +0200 @@ -155,6 +155,13 @@ # @return a map the export map def AI2Export(ai) ai = deep_copy(ai) + + # bootloader type and location stuff + exp = { + "loader_type" => Ops.get_string(ai, "loader_type", ""), + "specific" => {} + } + unsupported_bootloaders = ["grub", "zipl", "plilo", "lilo", "elilo"] if ai["loader_type"] && unsupported_bootloaders.include?(exp["loader_type"].downcase) # FIXME this should be better handled by exception and show it properly, but it require too big change now @@ -163,7 +170,6 @@ return nil end - BootCommon.DetectDisks if Mode.autoinst # prepare settings for default bootloader if not specified in the # profile @@ -174,12 +180,6 @@ end Builtins.y2milestone("Bootloader settings from profile: %1", ai) - # bootloader type and location stuff - exp = { - "loader_type" => Ops.get_string(ai, "loader_type", ""), - "specific" => {} - } - # define "global" sub-map to make sure we can add to the globals at # any time Ops.set(exp, ["specific", "global"], {}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.55/src/lib/bootloader/grub2base.rb new/yast2-bootloader-3.1.57/src/lib/bootloader/grub2base.rb --- old/yast2-bootloader-3.1.55/src/lib/bootloader/grub2base.rb 2014-06-16 13:23:49.000000000 +0200 +++ new/yast2-bootloader-3.1.57/src/lib/bootloader/grub2base.rb 2014-06-24 17:28:23.000000000 +0200 @@ -13,15 +13,16 @@ Yast.import "BootArch" Yast.import "BootCommon" Yast.import "BootStorage" + Yast.import "HTML" + Yast.import "Initrd" Yast.import "Kernel" Yast.import "Mode" + Yast.import "Pkg" + Yast.import "Product" + Yast.import "ProductFeatures" Yast.import "Stage" Yast.import "Storage" Yast.import "StorageDevices" - Yast.import "Pkg" - Yast.import "HTML" - Yast.import "Initrd" - Yast.import "Product" # includes # for simplified widgets than other @@ -53,13 +54,15 @@ # Propose global options of bootloader def StandardGlobals + # s390 do not have os_prober, see bnc#868909#c2 + disable_os_prober = Arch.s390 || ProductFeatures.GetBooleanFeature("general", "disable_os_prober") { "timeout" => "8", "default" => "0", "vgamode" => "", "gfxmode" => "auto", "terminal" => Arch.s390 ? "console" : "gfxterm", - "os_prober" => Arch.s390 ? "false" : "true", + "os_prober" => disable_os_prober ? "false" : "true", "activate" => Arch.ppc ? "true" : "false" } end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org