Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-01-31 11:51:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-14 20:01:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-01-31 11:51:11.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 28 09:56:33 UTC 2014 - [email protected] + +- Fix examining MBR +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.3.tar.bz2 New: ---- yast2-bootloader-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.JbcmyV/_old 2014-01-31 11:51:11.000000000 +0100 +++ /var/tmp/diff_new_pack.JbcmyV/_new 2014-01-31 11:51:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.3.tar.bz2 -> yast2-bootloader-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/package/yast2-bootloader.changes new/yast2-bootloader-3.1.4/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.3/package/yast2-bootloader.changes 2014-01-14 13:07:45.000000000 +0100 +++ new/yast2-bootloader-3.1.4/package/yast2-bootloader.changes 2014-01-30 14:13:00.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 28 09:56:33 UTC 2014 - [email protected] + +- Fix examining MBR +- 3.1.4 + +------------------------------------------------------------------- Tue Jan 14 10:37:06 UTC 2014 - [email protected] - handle problematic conversion of perl undef in perl-json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/package/yast2-bootloader.spec new/yast2-bootloader-3.1.4/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.3/package/yast2-bootloader.spec 2014-01-14 13:07:45.000000000 +0100 +++ new/yast2-bootloader-3.1.4/package/yast2-bootloader.spec 2014-01-30 14:13:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/include/bootloader/grub/options.rb new/yast2-bootloader-3.1.4/src/include/bootloader/grub/options.rb --- old/yast2-bootloader-3.1.3/src/include/bootloader/grub/options.rb 2014-01-14 11:06:53.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/include/bootloader/grub/options.rb 2014-01-30 14:13:00.000000000 +0100 @@ -590,8 +590,7 @@ boot_devices = BootStorage.getPartitionList(:boot, "grub") value = "" if BootCommon.VerifyMDArray - if BootCommon.enable_md_array_redundancy == nil || - BootCommon.enable_md_array_redundancy + if BootCommon.enable_md_array_redundancy UI.ChangeWidget(Id("enable_redundancy"), :Value, true) else UI.ChangeWidget(Id("enable_redundancy"), :Value, false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/include/bootloader/routines/lib_iface.rb new/yast2-bootloader-3.1.4/src/include/bootloader/routines/lib_iface.rb --- old/yast2-bootloader-3.1.3/src/include/bootloader/routines/lib_iface.rb 2014-01-14 13:07:45.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/include/bootloader/routines/lib_iface.rb 2014-01-30 14:13:00.000000000 +0100 @@ -411,7 +411,7 @@ device_data = TmpYAMLFile.new(device) ret_data = TmpYAMLFile.new - run_pbl_yaml "#{ret_data.path}=ExamineMBR(#{device_data})" + run_pbl_yaml "#{ret_data.path}=ExamineMBR(#{device_data.path})" ret = ret_data.data Builtins.y2milestone("Device: %1 includes in MBR: %2", device, ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootCommon.rb new/yast2-bootloader-3.1.4/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.3/src/modules/BootCommon.rb 2014-01-14 11:06:53.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/modules/BootCommon.rb 2014-01-30 14:13:00.000000000 +0100 @@ -982,6 +982,8 @@ # detect bootloader @loader_type = Convert.to_string(SCR.Read(path(".probe.boot_arch"))) @loader_type = "zipl" if @loader_type == "s390" + # ppc uses grub2 (fate #315753) + @loader_type = "grub2" if @loader_type == "ppc" # suppose grub2 should superscede grub .. @loader_type = "grub2" if @loader_type == "grub" Builtins.y2milestone("Bootloader detection returned %1", @loader_type) @@ -1146,7 +1148,8 @@ ] if Arch.i386 || Arch.x86_64 ret = Convert.convert( - Builtins.merge(ret, ["lilo", "grub", "grub2"]), + # don't add lilo (fate #314886) + Builtins.merge(ret, ["grub", "grub2"]), :from => "list", :to => "list <string>" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootGRUB.rb new/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb --- old/yast2-bootloader-3.1.3/src/modules/BootGRUB.rb 2014-01-14 11:06:53.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb 2014-01-30 14:13:00.000000000 +0100 @@ -456,19 +456,6 @@ "__devs" => [] } ) - elsif StorageDevices.FloppyPresent - out = Builtins.add( - out, - { - "name" => BootCommon.translateSectionTitle("floppy"), - "original_name" => "floppy", - "type" => "other", - "chainloader" => "/dev/fd0", - "__changed" => true, - "__auto" => true, - "__devs" => [] - } - ) end out = Builtins.add(out, CreateLinuxSection("failsafe")) out = Builtins.add(out, CreateLinuxSection("memtest86")) @@ -525,27 +512,25 @@ GfxMenu.ReadStatusAcousticSignal md_value = BootStorage.addMDSettingsToGlobals pB_md_value = Ops.get(BootCommon.globals, "boot_md_mbr", "") - if md_value != pB_md_value - if pB_md_value != "" - disks = Builtins.splitstring(pB_md_value, ",") - disks = Builtins.filter(disks) { |v| v != "" } - if Builtins.size(disks) == 2 - BootCommon.enable_md_array_redundancy = true - md_value = "" - end - Builtins.y2milestone( - "disks from md array (perl Bootloader): %1", - disks - ) - end - if md_value != "" - BootCommon.enable_md_array_redundancy = false - Ops.set(BootCommon.globals, "boot_md_mbr", md_value) - Builtins.y2milestone( - "Add md array to globals: %1", - BootCommon.globals - ) + if pB_md_value != "" + disks = Builtins.splitstring(pB_md_value, ",") + disks = Builtins.filter(disks) { |v| v != "" } + if Builtins.size(disks) == 2 + BootCommon.enable_md_array_redundancy = true + md_value = "" end + Builtins.y2milestone( + "disks from md array (perl Bootloader): %1", + disks + ) + end + if md_value != "" + BootCommon.enable_md_array_redundancy = false + Ops.set(BootCommon.globals, "boot_md_mbr", md_value) + Builtins.y2milestone( + "Add md array to globals: %1", + BootCommon.globals + ) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb --- old/yast2-bootloader-3.1.3/src/modules/BootGRUB2.rb 2014-01-14 11:06:53.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb 2014-01-30 14:13:00.000000000 +0100 @@ -84,27 +84,25 @@ if Mode.normal md_value = BootStorage.addMDSettingsToGlobals pB_md_value = Ops.get(BootCommon.globals, "boot_md_mbr", "") - if md_value != pB_md_value - if pB_md_value != "" - disks = Builtins.splitstring(pB_md_value, ",") - disks = Builtins.filter(disks) { |v| v != "" } - if Builtins.size(disks) == 2 - BootCommon.enable_md_array_redundancy = true - md_value = "" - end - Builtins.y2milestone( - "disks from md array (perl Bootloader): %1", - disks - ) - end - if md_value != "" - BootCommon.enable_md_array_redundancy = false - Ops.set(BootCommon.globals, "boot_md_mbr", md_value) - Builtins.y2milestone( - "Add md array to globals: %1", - BootCommon.globals - ) + if pB_md_value != "" + disks = Builtins.splitstring(pB_md_value, ",") + disks = Builtins.filter(disks) { |v| v != "" } + if Builtins.size(disks) == 2 + BootCommon.enable_md_array_redundancy = true + md_value = "" end + Builtins.y2milestone( + "disks from md array (perl Bootloader): %1", + disks + ) + end + if md_value != "" + BootCommon.enable_md_array_redundancy = false + Ops.set(BootCommon.globals, "boot_md_mbr", md_value) + Builtins.y2milestone( + "Add md array to globals: %1", + BootCommon.globals + ) end end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
