Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-08-06 15:31:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-07-28 06:31:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-08-06 15:31:50.000000000 +0200
@@ -1,0 +2,86 @@
+Wed Aug 6 08:59:52 UTC 2014 - jreidinger@suse.com
+
+- ignore unknown priority device to avoid problems in corner case
+ scenarios (bnc#890364)
+- 3.1.82
+
+-------------------------------------------------------------------
+Tue Aug 5 09:17:20 UTC 2014 - jreidinger@suse.com
+
+- fix assigning priority disks to device map for md raid
+ (bnc#890246)
+- fix choosing priority device causing bootloader crash
+ (bnc#890204)
+- 3.1.81
+
+-------------------------------------------------------------------
+Fri Aug 1 07:37:50 UTC 2014 - jsrain@suse.cz
+
+- fixed bootloader installation (bnc#889770)
+- 3.1.80
+
+-------------------------------------------------------------------
+Thu Jul 31 14:01:43 UTC 2014 - jreidinger@suse.com
+
+- Disk order dialog:
+ - fix non-working up button (bnc#885867)
+ - fix enabling/disabling up/down buttons in various situations
+ - when adding new device set focus to input field to better UX
+- 3.1.79
+
+-------------------------------------------------------------------
+Thu Jul 31 12:40:37 UTC 2014 - jreidinger@suse.com
+
+- reinit branding in upgrade of SLE-12 as it is overwritten
+ (bnc#879686)
+- 3.1.78
+
+-------------------------------------------------------------------
+Thu Jul 31 06:48:59 UTC 2014 - jreidinger@suse.com
+
+- fix crash in bootloader caused by wrong device in device map
+ (bnc#889670)
+- 3.1.77
+
+-------------------------------------------------------------------
+Wed Jul 30 14:03:18 CEST 2014 - schubi@suse.de
+
+- Fixed error popup for unsupported bootloader in autoyast.
+ (bnc#889538)
+- 3.1.76
+
+-------------------------------------------------------------------
+Wed Jul 30 08:20:59 UTC 2014 - ancor@suse.com
+
+- Added a missing call to i18n for a string (bnc#887553)
+- 3.1.75
+
+-------------------------------------------------------------------
+Wed Jul 30 06:30:40 UTC 2014 - jreidinger@suse.com
+
+- Fix crash if during proposal some device map value is nil
+ ( found by openQA )
+- 3.1.74
+
+-------------------------------------------------------------------
+Tue Jul 29 09:23:34 UTC 2014 - jreidinger@suse.com
+
+- Always use device with /boot as first device in device map to
+ avoid problems with other MBRs (bnc#887808, bnc#880439)
+- 3.1.73
+
+-------------------------------------------------------------------
+
+Mon Jul 28 07:18:47 UTC 2014 - jreidinger@suse.com
+
+- fix proposing disabledos prober on certain products (SLES is
+ affected) (bnc#884007)
+- 3.1.72
+
+-------------------------------------------------------------------
+Mon Jul 28 09:14:18 CEST 2014 - snwint@suse.de
+
+- enable secure boot by default (bnc #879486)
+- 3.1.71
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-3.1.70.tar.bz2
New:
----
yast2-bootloader-3.1.82.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.TmuBbc/_old 2014-08-06 15:31:51.000000000 +0200
+++ /var/tmp/diff_new_pack.TmuBbc/_new 2014-08-06 15:31:51.000000000 +0200
@@ -17,12 +17,13 @@
Name: yast2-bootloader
-Version: 3.1.70
+Version: 3.1.82
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
+Url: http://github.com/yast/yast-bootloader
BuildRequires: rubygem-rspec
BuildRequires: update-desktop-files
BuildRequires: yast2 >= 3.1.0
@@ -121,7 +122,6 @@
%{yast_ybindir}/*
%dir %{yast_scrconfdir}
%{yast_scrconfdir}/*.scr
-%dir %{yast_fillupdir}
%{yast_fillupdir}/*
%dir %{yast_schemadir}
%dir %{yast_schemadir}/autoyast
@@ -133,6 +133,7 @@
%doc %{yast_docdir}/COPYING
%files devel-doc
+%defattr(-,root,root)
%doc %{yast_docdir}/autodocs
%changelog
++++++ yast2-bootloader-3.1.70.tar.bz2 -> yast2-bootloader-3.1.82.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/package/yast2-bootloader.changes new/yast2-bootloader-3.1.82/package/yast2-bootloader.changes
--- old/yast2-bootloader-3.1.70/package/yast2-bootloader.changes 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/package/yast2-bootloader.changes 2014-08-06 11:17:45.000000000 +0200
@@ -1,4 +1,90 @@
-------------------------------------------------------------------
+Wed Aug 6 08:59:52 UTC 2014 - jreidinger@suse.com
+
+- ignore unknown priority device to avoid problems in corner case
+ scenarios (bnc#890364)
+- 3.1.82
+
+-------------------------------------------------------------------
+Tue Aug 5 09:17:20 UTC 2014 - jreidinger@suse.com
+
+- fix assigning priority disks to device map for md raid
+ (bnc#890246)
+- fix choosing priority device causing bootloader crash
+ (bnc#890204)
+- 3.1.81
+
+-------------------------------------------------------------------
+Fri Aug 1 07:37:50 UTC 2014 - jsrain@suse.cz
+
+- fixed bootloader installation (bnc#889770)
+- 3.1.80
+
+-------------------------------------------------------------------
+Thu Jul 31 14:01:43 UTC 2014 - jreidinger@suse.com
+
+- Disk order dialog:
+ - fix non-working up button (bnc#885867)
+ - fix enabling/disabling up/down buttons in various situations
+ - when adding new device set focus to input field to better UX
+- 3.1.79
+
+-------------------------------------------------------------------
+Thu Jul 31 12:40:37 UTC 2014 - jreidinger@suse.com
+
+- reinit branding in upgrade of SLE-12 as it is overwritten
+ (bnc#879686)
+- 3.1.78
+
+-------------------------------------------------------------------
+Thu Jul 31 06:48:59 UTC 2014 - jreidinger@suse.com
+
+- fix crash in bootloader caused by wrong device in device map
+ (bnc#889670)
+- 3.1.77
+
+-------------------------------------------------------------------
+Wed Jul 30 14:03:18 CEST 2014 - schubi@suse.de
+
+- Fixed error popup for unsupported bootloader in autoyast.
+ (bnc#889538)
+- 3.1.76
+
+-------------------------------------------------------------------
+Wed Jul 30 08:20:59 UTC 2014 - ancor@suse.com
+
+- Added a missing call to i18n for a string (bnc#887553)
+- 3.1.75
+
+-------------------------------------------------------------------
+Wed Jul 30 06:30:40 UTC 2014 - jreidinger@suse.com
+
+- Fix crash if during proposal some device map value is nil
+ ( found by openQA )
+- 3.1.74
+
+-------------------------------------------------------------------
+Tue Jul 29 09:23:34 UTC 2014 - jreidinger@suse.com
+
+- Always use device with /boot as first device in device map to
+ avoid problems with other MBRs (bnc#887808, bnc#880439)
+- 3.1.73
+
+-------------------------------------------------------------------
+
+Mon Jul 28 07:18:47 UTC 2014 - jreidinger@suse.com
+
+- fix proposing disabledos prober on certain products (SLES is
+ affected) (bnc#884007)
+- 3.1.72
+
+-------------------------------------------------------------------
+Mon Jul 28 09:14:18 CEST 2014 - snwint@suse.de
+
+- enable secure boot by default (bnc #879486)
+- 3.1.71
+
+-------------------------------------------------------------------
Fri Jul 25 16:11:37 UTC 2014 - jreidinger@suse.com
- allow change of bootloader proposal during upgrade (bnc#887015)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/package/yast2-bootloader.spec new/yast2-bootloader-3.1.82/package/yast2-bootloader.spec
--- old/yast2-bootloader-3.1.70/package/yast2-bootloader.spec 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/package/yast2-bootloader.spec 2014-08-06 11:17:45.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.70
+Version: 3.1.82
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -25,6 +25,7 @@
Group: System/YaST
License: GPL-2.0+
+Url: http://github.com/yast/yast-bootloader
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2 >= 3.1.0
BuildRequires: update-desktop-files
@@ -106,7 +107,6 @@
%{yast_ybindir}/*
%dir %{yast_scrconfdir}
%{yast_scrconfdir}/*.scr
-%dir %{yast_fillupdir}
%{yast_fillupdir}/*
%dir %{yast_schemadir}
%dir %{yast_schemadir}/autoyast
@@ -118,5 +118,6 @@
%doc %{yast_docdir}/COPYING
%files devel-doc
+%defattr(-,root,root)
%doc %{yast_docdir}/autodocs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/src/clients/bootloader_finish.rb new/yast2-bootloader-3.1.82/src/clients/bootloader_finish.rb
--- old/yast2-bootloader-3.1.70/src/clients/bootloader_finish.rb 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/src/clients/bootloader_finish.rb 2014-08-06 11:17:45.000000000 +0200
@@ -214,6 +214,18 @@
@ret = nil
end
+ # FIXME workaround grub2 in upgrade need manual rerun of branding
+ # package. see bnc#879686
+ if Mode.update && Bootloader.getLoaderType =~ /grub2/
+ prefix = Installation.destdir
+ branding_activator = Dir["#{prefix}/usr/share/grub2/themes/*/activate-theme"].first
+ if branding_activator
+ branding_activator = branding_activator[prefix.size..-1]
+ res = SCR.Execute(path(".target.bash_output"), branding_activator)
+ Builtins.y2milestone("Reactivate branding with #{branding_activator} and result #{res}")
+ end
+ end
+
Builtins.y2debug("ret=%1", @ret)
Builtins.y2milestone("bootloader_finish finished")
deep_copy(@ret)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/src/include/bootloader/grub/helps.rb new/yast2-bootloader-3.1.82/src/include/bootloader/grub/helps.rb
--- old/yast2-bootloader-3.1.70/src/include/bootloader/grub/helps.rb 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/src/include/bootloader/grub/helps.rb 2014-08-06 11:17:45.000000000 +0200
@@ -56,7 +56,9 @@
"in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n" +
"to start this section.</p>"
),
- "boot_extended" => "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \nlogical partition and the /boot partition is missing</p>",
+ "boot_extended" => _(
+ "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \nlogical partition and the /boot partition is missing</p>"
+ ),
"boot_custom" => _(
"<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/src/include/bootloader/grub/options.rb new/yast2-bootloader-3.1.82/src/include/bootloader/grub/options.rb
--- old/yast2-bootloader-3.1.70/src/include/bootloader/grub/options.rb 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/src/include/bootloader/grub/options.rb 2014-08-06 11:17:45.000000000 +0200
@@ -464,70 +464,60 @@
VSpacing(1)
)
UI.OpenDialog(popup)
- pushed = Convert.to_symbol(UI.UserInput)
- new_dev = Convert.to_string(UI.QueryWidget(Id(:devname), :Value))
+ UI.SetFocus(:devname)
+ pushed = UI.UserInput
+ new_dev = UI.QueryWidget(Id(:devname), :Value)
UI.CloseDialog
- ret = ""
- ret = new_dev if pushed == :ok
- ret
+
+ pushed == :ok ? new_dev : ""
end
def HandleDiskOrder(widget, event)
- event = deep_copy(event)
- action = Ops.get(event, "ID")
+ action = event["ID"]
changed = false
- disksOrder = Convert.convert(
- UI.QueryWidget(Id(:disks), :Items),
- :from => "any",
- :to => "list <term>"
- )
- current = Convert.to_string(UI.QueryWidget(Id(:disks), :CurrentItem))
+ disksOrder = UI.QueryWidget(Id(:disks), :Items)
+ current = UI.QueryWidget(Id(:disks), :CurrentItem)
pos = 0
- while Ops.less_than(pos, Builtins.size(disksOrder)) &&
- GetItemID(Ops.get(disksOrder, pos) { term(:Item, Id("")) }) != current
- pos = Ops.add(pos, 1)
+ while pos < disksOrder.size &&
+ GetItemID(disksOrder[pos] || term(:Item, Id(""))) != current
+ pos += 1
end
+ Builtins.y2debug("Calling handle disk order with action #{action} and selected on pos #{pos}")
- #disabling & enabling up/down
- UI.ChangeWidget(
- Id(:up),
- :Enabled,
- Ops.greater_than(pos, 0) &&
- Ops.less_than(pos, Builtins.size(disksOrder))
- )
- UI.ChangeWidget(
- Id(:down),
- :Enabled,
- Ops.less_than(pos, Ops.subtract(Builtins.size(disksOrder), 1))
- )
- if action == :up
+ case action
+ when :up
changed = true
- disksOrder = Builtins::List.swap(disksOrder, pos, Ops.subtract(pos, 1))
- elsif action == :down
+ # swap elements
+ disksOrder.insert(pos - 1, disksOrder.delete_at(pos))
+ pos -= 1
+ when :down
changed = true
- disksOrder = Builtins::List.swap(disksOrder, pos, Ops.add(pos, 1))
- elsif action == :delete
+ # swap elements
+ disksOrder.insert(pos + 1, disksOrder.delete_at(pos))
+ pos += 1
+ when :delete
changed = true
disksOrder = Builtins.remove(disksOrder, pos)
+ pos = pos > 0 ? pos -1 : 0
UI.ChangeWidget(
Id(:disks),
:CurrentItem,
- Ops.greater_than(pos, 0) ?
- GetItemID(Ops.get(disksOrder, Ops.subtract(pos, 1)) do
- term(:Item, Id(""))
- end) :
- GetItemID(Ops.get(disksOrder, 0) { term(:Item, Id("")) })
+ GetItemID(disksOrder[pos] || term(:Item, Id("")))
)
- elsif action == :add
+ when :add
new_dev = NewDevicePopup()
if new_dev != ""
changed = true
- disksOrder = Builtins.add(disksOrder, Item(Id(new_dev), new_dev))
+ disksOrder << Item(Id(new_dev), new_dev)
end
end
+ #disabling & enabling up/down, do it after change
+ UI.ChangeWidget(Id(:up), :Enabled, pos > 0 && pos < disksOrder.size)
+ UI.ChangeWidget(Id(:down), :Enabled, pos < disksOrder.size - 1)
+
UI.ChangeWidget(Id(:disks), :Items, disksOrder) if changed
nil
@@ -550,7 +540,7 @@
HSpacing(2),
VBox(
VSpacing(1),
- SelectionBox(Id(:disks), Opt(:notify, :immediate), _("D&isks"), []),
+ SelectionBox(Id(:disks), Opt(:notify), _("D&isks"), []),
HBox(
HStretch(),
PushButton(Id(:add), Opt(:key_F3), Label.AddButton),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/src/include/bootloader/grub2/misc.rb new/yast2-bootloader-3.1.82/src/include/bootloader/grub2/misc.rb
--- old/yast2-bootloader-3.1.70/src/include/bootloader/grub2/misc.rb 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/src/include/bootloader/grub2/misc.rb 2014-08-06 11:17:45.000000000 +0200
@@ -440,7 +440,7 @@
mbr_dev = Ops.get_string(m_activate, "mbr", "")
raise "INTERNAL ERROR: Data for partition to activate is invalid." if num == 0 || mbr_dev.empty?
- gpt_disk = Storage.GetTargetMap[BootCommon.mbrDisk]["label"] == "gpt"
+ gpt_disk = Storage.GetDisk(Storage.GetTargetMap, BootCommon.mbrDisk)["label"] == "gpt"
# if primary partition on old DOS MBR table, GPT do not have such limit
if !(Arch.ppc && gpt_disk) && (gpt_disk || num <= 4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/src/include/bootloader/routines/autoinstall.rb new/yast2-bootloader-3.1.82/src/include/bootloader/routines/autoinstall.rb
--- old/yast2-bootloader-3.1.70/src/include/bootloader/routines/autoinstall.rb 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/src/include/bootloader/routines/autoinstall.rb 2014-08-06 11:17:45.000000000 +0200
@@ -166,8 +166,8 @@
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
- Popup.Error(_("Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."),
- exp["loader_type"])
+ Popup.Error(_("Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly.") %
+ exp["loader_type"])
return nil
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/src/include/bootloader/routines/lilolike.rb new/yast2-bootloader-3.1.82/src/include/bootloader/routines/lilolike.rb
--- old/yast2-bootloader-3.1.70/src/include/bootloader/routines/lilolike.rb 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/src/include/bootloader/routines/lilolike.rb 2014-08-06 11:17:45.000000000 +0200
@@ -251,52 +251,6 @@
nil
end
- # Converts the md device to the list of devices building it
- # @param [String] md_device string md device
- # @return a map of devices (from device name to BIOS ID or nil if
- # not detected) building the md device
- def Md2Partitions(md_device)
- ret = {}
- tm = Storage.GetTargetMap
- Builtins.foreach(tm) do |disk, descr_a|
- descr = Convert.convert(
- descr_a,
- :from => "any",
- :to => "map "
- )
- bios_id_str = Ops.get_string(descr, "bios_id", "")
- bios_id = 256 # maximum + 1 (means: no bios_id found)
- bios_id = Builtins.tointeger(bios_id) if bios_id_str != ""
- partitions = Ops.get_list(descr, "partitions", [])
- Builtins.foreach(partitions) do |partition|
- if Ops.get_string(partition, "used_by_device", "") == md_device
- d = Ops.get_string(partition, "device", "")
- Ops.set(ret, d, bios_id)
- end
- end
- end
- Builtins.y2milestone("Partitions building %1: %2", md_device, ret)
- deep_copy(ret)
- end
-
- # Converts the md device to the first of its members
- # @param [String] md_device string md device
- # @return [String] one of devices building the md array
- def Md2Partition(md_device)
- devices = Md2Partitions(md_device)
- return md_device if Builtins.size(devices) == 0
- minimal = 129 # maximum + 2
- found = ""
- Builtins.foreach(devices) do |k, v|
- if Ops.less_than(v, minimal)
- found = k
- minimal = v
- end
- end
- found
- end
-
-
# Run delayed updates
#
# This is used by perl-Bootloader when it cannot remove sections from the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/src/lib/bootloader/grub2base.rb new/yast2-bootloader-3.1.82/src/lib/bootloader/grub2base.rb
--- old/yast2-bootloader-3.1.70/src/lib/bootloader/grub2base.rb 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/src/lib/bootloader/grub2base.rb 2014-08-06 11:17:45.000000000 +0200
@@ -55,7 +55,7 @@
# 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")
+ disable_os_prober = Arch.s390 || ProductFeatures.GetBooleanFeature("globals", "disable_os_prober")
{
"timeout" => "8",
"default" => "0",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.70/src/modules/BootCommon.rb new/yast2-bootloader-3.1.82/src/modules/BootCommon.rb
--- old/yast2-bootloader-3.1.70/src/modules/BootCommon.rb 2014-07-25 18:53:13.000000000 +0200
+++ new/yast2-bootloader-3.1.82/src/modules/BootCommon.rb 2014-08-06 11:17:45.000000000 +0200
@@ -1008,6 +1008,11 @@
ret
end
+ # FIXME just backward compatible interface, call directly BootStorage
+ def Md2Partitions(md_device)
+ BootStorage.Md2Partitions(md_device)
+ end
+
publish :variable => :global_options, :type => "map "
publish :variable => :globals, :type => "map "
publish :variable => :sections, :type => "list