Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2015-02-13 08:34:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-02-08 13:02:32.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes
2015-02-13 08:35:00.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Feb 12 12:45:50 UTC 2015 - jreidin...@suse.com
+
+- fix redundancy boot proposal if there are more devices
+ (bnc#917025)
+- 3.1.120
+
+-------------------------------------------------------------------
+Tue Feb 10 15:24:53 UTC 2015 - an...@suse.com
+
+- Fixed detection for encrypted partitions (bnc#913540)
+- 3.1.119
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-3.1.118.tar.bz2
New:
----
yast2-bootloader-3.1.120.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.RnD07N/_old 2015-02-13 08:35:01.000000000 +0100
+++ /var/tmp/diff_new_pack.RnD07N/_new 2015-02-13 08:35:01.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.118
+Version: 3.1.120
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-bootloader-3.1.118.tar.bz2 -> yast2-bootloader-3.1.120.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.118/.travis.yml
new/yast2-bootloader-3.1.120/.travis.yml
--- old/yast2-bootloader-3.1.118/.travis.yml 2015-02-06 14:42:38.000000000
+0100
+++ new/yast2-bootloader-3.1.120/.travis.yml 2015-02-12 14:27:13.000000000
+0100
@@ -5,7 +5,7 @@
# disable rvm, use system Ruby
- rvm reset
- wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
- - sh ./travis_setup.sh -p "yast2-devtools yast2 yast2-storage rake" -g
"gettext yast-rake yard rspec:2.14.1 simplecov coveralls rubocop:0.27.1"
+ - sh ./travis_setup.sh -p "yast2-devtools yast2 yast2-storage rake" -g
"gettext yast-rake yard rspec:2.14.1 simplecov coveralls rubocop:0.29.0"
script:
- rake check:syntax
- rake check:pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/package/yast2-bootloader.changes
new/yast2-bootloader-3.1.120/package/yast2-bootloader.changes
--- old/yast2-bootloader-3.1.118/package/yast2-bootloader.changes
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/package/yast2-bootloader.changes
2015-02-12 14:27:13.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Thu Feb 12 12:45:50 UTC 2015 - jreidin...@suse.com
+
+- fix redundancy boot proposal if there are more devices
+ (bnc#917025)
+- 3.1.120
+
+-------------------------------------------------------------------
+Tue Feb 10 15:24:53 UTC 2015 - an...@suse.com
+
+- Fixed detection for encrypted partitions (bnc#913540)
+- 3.1.119
+
+-------------------------------------------------------------------
Fri Feb 6 12:46:48 UTC 2015 - an...@suse.com
- The unit tests are now compatible with RSpec 3 (bnc#916364)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/package/yast2-bootloader.spec
new/yast2-bootloader-3.1.120/package/yast2-bootloader.spec
--- old/yast2-bootloader-3.1.118/package/yast2-bootloader.spec 2015-02-06
14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/package/yast2-bootloader.spec 2015-02-12
14:27:13.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.118
+Version: 3.1.120
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/src/include/bootloader/grub/helps.rb
new/yast2-bootloader-3.1.120/src/include/bootloader/grub/helps.rb
--- old/yast2-bootloader-3.1.118/src/include/bootloader/grub/helps.rb
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/src/include/bootloader/grub/helps.rb
2015-02-12 14:27:13.000000000 +0100
@@ -85,11 +85,11 @@
),
# help text 1/5
"disk_order" => _(
- "<p><big><b>Disks Order</b></big><br>\n" \
- "To specify the order of the disks according to the order in
BIOS, use\n" \
- "the <b>Up</b> and <b>Down</b> buttons to reorder the disks.\n" \
- "To add a disk, push <b>Add</b>.\n" \
- "To remove a disk, push <b>Remove</b>.</p>"
+ "<p><big><b>Disks Order</b></big><br>\n" \
+ "To specify the order of the disks according to the order in BIOS,
use\n" \
+ "the <b>Up</b> and <b>Down</b> buttons to reorder the disks.\n" \
+ "To add a disk, push <b>Add</b>.\n" \
+ "To remove a disk, push <b>Remove</b>.</p>"
)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/src/include/bootloader/grub2/dialogs.rb
new/yast2-bootloader-3.1.120/src/include/bootloader/grub2/dialogs.rb
--- old/yast2-bootloader-3.1.118/src/include/bootloader/grub2/dialogs.rb
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/src/include/bootloader/grub2/dialogs.rb
2015-02-12 14:27:13.000000000 +0100
@@ -57,9 +57,12 @@
# if name is not included, that it is not displayed
"widget_names" => widget_names,
"contents" => VBox(
- VSquash(HBox(
- Top(VBox(VSpacing(1), "loader_type")),
- Arch.s390 || Arch.aarch64 ? Empty() : "loader_location")),
+ VSquash(
+ HBox(
+ Top(VBox(VSpacing(1), "loader_type")),
+ Arch.s390 || Arch.aarch64 ? Empty() : "loader_location"
+ )
+ ),
MarginBox(1, 0.5, "distributor"),
MarginBox(1, 0.5, Left("activate")),
MarginBox(1, 0.5, Left("generic_mbr")),
@@ -147,13 +150,13 @@
caption = _("Boot Loader Options")
CWM.ShowAndRun(
- "widget_descr" => widgets,
- "widget_names" => ["tab"],
- "contents" => VBox("tab"),
- "caption" => caption,
- "back_button" => Label.BackButton,
- "abort_button" => Label.CancelButton,
- "next_button" => Label.OKButton
+ "widget_descr" => widgets,
+ "widget_names" => ["tab"],
+ "contents" => VBox("tab"),
+ "caption" => caption,
+ "back_button" => Label.BackButton,
+ "abort_button" => Label.CancelButton,
+ "next_button" => Label.OKButton
)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/src/include/bootloader/routines/dialogs.rb
new/yast2-bootloader-3.1.120/src/include/bootloader/routines/dialogs.rb
--- old/yast2-bootloader-3.1.118/src/include/bootloader/routines/dialogs.rb
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/src/include/bootloader/routines/dialogs.rb
2015-02-12 14:27:13.000000000 +0100
@@ -104,10 +104,10 @@
"tab",
CWMTab.CreateWidget(
- "tab_order" => ["boot_code_tab", "kernel_tab",
"bootloader_tab"],
- "tabs" => Grub2TabDescr(),
- "widget_descr" => widget_descr,
- "initial_tab" => "boot_code_tab"
+ "tab_order" => ["boot_code_tab", "kernel_tab", "bootloader_tab"],
+ "tabs" => Grub2TabDescr(),
+ "widget_descr" => widget_descr,
+ "initial_tab" => "boot_code_tab"
)
)
@@ -117,14 +117,14 @@
caption = _("Boot Loader Settings")
ret = CWM.ShowAndRun(
- "widget_descr" => widget_descr,
- "widget_names" => widget_names,
- "contents" => contents,
- "caption" => caption,
- "back_button" => "",
- "abort_button" => Label.CancelButton,
- "next_button" => Label.OKButton,
- "fallback_functions" => @global_handlers
+ "widget_descr" => widget_descr,
+ "widget_names" => widget_names,
+ "contents" => contents,
+ "caption" => caption,
+ "back_button" => "",
+ "abort_button" => Label.CancelButton,
+ "next_button" => Label.OKButton,
+ "fallback_functions" => @global_handlers
)
if ret != :back && ret != :abort && ret != :cancel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/src/include/bootloader/routines/global_widgets.rb
new/yast2-bootloader-3.1.120/src/include/bootloader/routines/global_widgets.rb
---
old/yast2-bootloader-3.1.118/src/include/bootloader/routines/global_widgets.rb
2015-02-06 14:42:38.000000000 +0100
+++
new/yast2-bootloader-3.1.120/src/include/bootloader/routines/global_widgets.rb
2015-02-12 14:27:13.000000000 +0100
@@ -135,15 +135,15 @@
if new_bl == "none"
# popup - Continue/Cancel
- if Popup.ContinueCancel(
- _(
- "\n" \
- "If you do not install any boot loader, the system\n" \
- "might not start.\n" \
- "\n" \
- "Proceed?\n"
- )
- )
+ popup_msg = _(
+ "\n" \
+ "If you do not install any boot loader, the system\n" \
+ "might not start.\n" \
+ "\n" \
+ "Proceed?\n"
+ )
+
+ if Popup.ContinueCancel(popup_msg)
BootCommon.setLoaderType("none")
BootCommon.location_changed = true
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/src/lib/bootloader/device_map_dialog.rb
new/yast2-bootloader-3.1.120/src/lib/bootloader/device_map_dialog.rb
--- old/yast2-bootloader-3.1.118/src/lib/bootloader/device_map_dialog.rb
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/src/lib/bootloader/device_map_dialog.rb
2015-02-12 14:27:13.000000000 +0100
@@ -32,8 +32,11 @@
private
def create_dialog
- Yast::UI.OpenDialog dialog_content
+ res = Yast::UI.OpenDialog dialog_content
+ return false unless res
refresh_buttons
+
+ true
end
def close_dialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/src/lib/bootloader/disk_change_detector.rb
new/yast2-bootloader-3.1.120/src/lib/bootloader/disk_change_detector.rb
--- old/yast2-bootloader-3.1.118/src/lib/bootloader/disk_change_detector.rb
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/src/lib/bootloader/disk_change_detector.rb
2015-02-12 14:27:13.000000000 +0100
@@ -45,7 +45,7 @@
# TRANSLATORS: %s stands for partition
ret <<
_("Selected custom bootloader partition %s is not available any
more.") %
- Yast::BootCommon.globals["boot_custom"]
+ Yast::BootCommon.globals["boot_custom"]
end
ret
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/src/lib/bootloader/udev_mapping.rb
new/yast2-bootloader-3.1.120/src/lib/bootloader/udev_mapping.rb
--- old/yast2-bootloader-3.1.118/src/lib/bootloader/udev_mapping.rb
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/src/lib/bootloader/udev_mapping.rb
2015-02-12 14:27:13.000000000 +0100
@@ -59,7 +59,9 @@
# disk no longer exists
return kernel_dev unless disk
- storage_data = disk["partitions"].find { |p| p["device"] == kernel_dev
}
+ storage_data = disk["partitions"].find do |p|
+ [p["device"], p["crypt_device"]].include?(kernel_dev)
+ end
end
raise "Unknown device #{kernel_dev}" unless storage_data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.118/src/modules/BootStorage.rb
new/yast2-bootloader-3.1.120/src/modules/BootStorage.rb
--- old/yast2-bootloader-3.1.118/src/modules/BootStorage.rb 2015-02-06
14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/src/modules/BootStorage.rb 2015-02-12
14:27:13.000000000 +0100
@@ -352,10 +352,9 @@
boot_devices.each do |dev|
ret = checkMDDevices(tm, dev)
- if !ret
- log.info "Skip enable redundancy of md arrays"
- return []
- end
+ # only log if device is not suitable, otherwise md redundancy is not
+ # allowed even if there is some suitable device (bnc#917025)
+ log.info "Skip enable redundancy for device #{dev}" unless ret
end
@md_physical_disks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/src/modules/BootSupportCheck.rb
new/yast2-bootloader-3.1.120/src/modules/BootSupportCheck.rb
--- old/yast2-bootloader-3.1.118/src/modules/BootSupportCheck.rb
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/src/modules/BootSupportCheck.rb
2015-02-12 14:27:13.000000000 +0100
@@ -135,10 +135,12 @@
Builtins.y2error("Used together boot from MBR, gpt, btrfs and without
bios_grub partition.")
# TRANSLATORS: description of technical problem. Do not translate
technical terms unless native language have well known translation.
- AddNewProblem(_(
+ AddNewProblem(
+ _(
"Boot from MBR does not work together with btrfs filesystem and GPT
disk label without bios_grub partition." \
"To fix this issue, create bios_grub partition or use any ext
filesystem for boot partition or do not install stage 1 to MBR."
- ))
+ )
+ )
false
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/test/bootloader_finish_client_test.rb
new/yast2-bootloader-3.1.120/test/bootloader_finish_client_test.rb
--- old/yast2-bootloader-3.1.118/test/bootloader_finish_client_test.rb
2015-02-06 14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/test/bootloader_finish_client_test.rb
2015-02-12 14:27:13.000000000 +0100
@@ -107,7 +107,6 @@
expect(subject.write).to eq false
end
-
end
context "grub2 based bootloader" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.118/test/device_map_dialog_test.rb
new/yast2-bootloader-3.1.120/test/device_map_dialog_test.rb
--- old/yast2-bootloader-3.1.118/test/device_map_dialog_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-bootloader-3.1.120/test/device_map_dialog_test.rb 2015-02-12
14:27:13.000000000 +0100
@@ -0,0 +1,70 @@
+require_relative "test_helper"
+
+require "bootloader/device_map_dialog"
+
+describe Bootloader::DeviceMapDialog do
+ # just simple tests to avoid typos as logic is not so easy to test
+ describe "#run" do
+ before do
+ Yast.import "BootStorage"
+
+ device_map = Bootloader::DeviceMap.new(
+ "/dev/sda" => "hd0",
+ "/dev/sdb" => "hd1"
+ )
+ allow(Yast::BootStorage).to receive(:DisksOrder)
+ .and_return(device_map.disks_order)
+
+ allow(Yast::UI).to receive(:QueryWidget).and_return("/dev/sda")
+ allow(Yast::UI).to receive(:OpenDialog).and_return(true)
+ allow(Yast::UI).to receive(:CloseDialog).and_return(true)
+ end
+
+ def mock_ui_events(*events)
+ allow(Yast::UI).to receive(:UserInput).and_return(*events)
+ end
+
+ it "always returns symbol :back" do
+ mock_ui_events(:ok)
+
+ expect(subject.run).to eq :back
+
+ mock_ui_events(:cancel)
+
+ expect(subject.run).to eq :back
+ end
+
+ it "allows adding disks after clicking on button" do
+ # need additional ok for adding dialog
+ mock_ui_events(:add, :ok, :ok)
+
+ expect(subject.run).to eq :back
+ end
+
+ it "allows removing disks after clicking on button" do
+ mock_ui_events(:delete, :ok)
+ # need to simulate that disk gone
+ allow(Yast::UI).to receive(:QueryWidget).and_return("/dev/sda",
"/dev/sda", "/dev/sdb")
+
+ expect(subject.run).to eq :back
+ end
+
+ it "allows moving disk in order up by clicking on button" do
+ mock_ui_events(:up, :ok)
+
+ expect(subject.run).to eq :back
+ end
+
+ it "allows moving disk in order down by clicking on button" do
+ mock_ui_events(:down, :ok)
+
+ expect(subject.run).to eq :back
+ end
+
+ it "react when user change selection in disk order" do
+ mock_ui_events(:disks, :ok)
+
+ expect(subject.run).to eq :back
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.118/test/device_map_test.rb
new/yast2-bootloader-3.1.120/test/device_map_test.rb
--- old/yast2-bootloader-3.1.118/test/device_map_test.rb 2015-02-06
14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/test/device_map_test.rb 2015-02-12
14:27:13.000000000 +0100
@@ -78,9 +78,9 @@
it "returns device map with keys mapped to mount_by option" do
map = Bootloader::DeviceMap.new(
- "/dev/vdb" => "hd0",
- "/dev/vda" => "hd2",
- "/dev/vdc" => "hd1"
+ "/dev/vdb" => "hd0",
+ "/dev/vda" => "hd2",
+ "/dev/vdc" => "hd1"
)
expect(Bootloader::UdevMapping).to receive(:to_kernel_device)
@@ -112,7 +112,6 @@
before do
allow(Bootloader::UdevMapping).to receive(:to_mountby_device)
.and_return("/dev/bla")
-
end
it "checks if device map contain passed disk" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.118/test/sysconfig_test.rb
new/yast2-bootloader-3.1.120/test/sysconfig_test.rb
--- old/yast2-bootloader-3.1.118/test/sysconfig_test.rb 2015-02-06
14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/test/sysconfig_test.rb 2015-02-12
14:27:13.000000000 +0100
@@ -81,7 +81,6 @@
)
sysconfig.pre_write
-
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.118/test/udev_mapping_test.rb
new/yast2-bootloader-3.1.120/test/udev_mapping_test.rb
--- old/yast2-bootloader-3.1.118/test/udev_mapping_test.rb 2015-02-06
14:42:38.000000000 +0100
+++ new/yast2-bootloader-3.1.120/test/udev_mapping_test.rb 2015-02-12
14:27:13.000000000 +0100
@@ -50,8 +50,8 @@
disk = "/dev/system"
number = "system"
when "/dev/mapper/cr_swap"
- disk = "/dev/mapper/cr_swap"
- number = ""
+ disk = "/dev/sda"
+ number = "1"
when "tmpfs"
disk = "tmpfs"
number = ""
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
