Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2014-08-11 10:09:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-06 15:31:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes
2014-08-11 10:09:47.000000000 +0200
@@ -1,0 +2,20 @@
+Fri Aug 8 13:55:23 UTC 2014 - jreidin...@suse.com
+
+- do not crash in some condition in combination of LVM and GPT
+ (bnc#891070)
+- 3.1.85
+
+-------------------------------------------------------------------
+Thu Aug 7 13:39:09 UTC 2014 - jreidin...@suse.com
+
+- fix assigning priority disks to device map for LVM (bnc#890364)
+- 3.1.84
+
+-------------------------------------------------------------------
+Thu Aug 7 08:32:39 UTC 2014 - jreidin...@suse.com
+
+- workaround initrd recreation if some packages forgot during
+ upgrade (bnc#889616)
+- 3.1.83
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-3.1.82.tar.bz2
New:
----
yast2-bootloader-3.1.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.zCKnX7/_old 2014-08-11 10:09:48.000000000 +0200
+++ /var/tmp/diff_new_pack.zCKnX7/_new 2014-08-11 10:09:48.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.82
+Version: 3.1.85
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-bootloader-3.1.82.tar.bz2 -> yast2-bootloader-3.1.85.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.82/package/yast2-bootloader.changes
new/yast2-bootloader-3.1.85/package/yast2-bootloader.changes
--- old/yast2-bootloader-3.1.82/package/yast2-bootloader.changes
2014-08-06 11:17:45.000000000 +0200
+++ new/yast2-bootloader-3.1.85/package/yast2-bootloader.changes
2014-08-08 16:12:44.000000000 +0200
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Fri Aug 8 13:55:23 UTC 2014 - jreidin...@suse.com
+
+- do not crash in some condition in combination of LVM and GPT
+ (bnc#891070)
+- 3.1.85
+
+-------------------------------------------------------------------
+Thu Aug 7 13:39:09 UTC 2014 - jreidin...@suse.com
+
+- fix assigning priority disks to device map for LVM (bnc#890364)
+- 3.1.84
+
+-------------------------------------------------------------------
+Thu Aug 7 08:32:39 UTC 2014 - jreidin...@suse.com
+
+- workaround initrd recreation if some packages forgot during
+ upgrade (bnc#889616)
+- 3.1.83
+
+-------------------------------------------------------------------
Wed Aug 6 08:59:52 UTC 2014 - jreidin...@suse.com
- ignore unknown priority device to avoid problems in corner case
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.82/package/yast2-bootloader.spec
new/yast2-bootloader-3.1.85/package/yast2-bootloader.spec
--- old/yast2-bootloader-3.1.82/package/yast2-bootloader.spec 2014-08-06
11:17:45.000000000 +0200
+++ new/yast2-bootloader-3.1.85/package/yast2-bootloader.spec 2014-08-08
16:12:44.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.82
+Version: 3.1.85
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.82/src/clients/bootloader_finish.rb
new/yast2-bootloader-3.1.85/src/clients/bootloader_finish.rb
--- old/yast2-bootloader-3.1.82/src/clients/bootloader_finish.rb
2014-08-06 11:17:45.000000000 +0200
+++ new/yast2-bootloader-3.1.85/src/clients/bootloader_finish.rb
2014-08-08 16:12:44.000000000 +0200
@@ -225,6 +225,13 @@
Builtins.y2milestone("Reactivate branding with #{branding_activator}
and result #{res}")
end
end
+ # workaround for packages that forgot to update initrd(bnc#889616)
+ # do not use Initrd module as it can also change configuration, which we
do not want
+ if Mode.update
+ res = SCR.Execute(path(".target.bash_output"), "/sbin/mkinitrd")
+ Builtins.y2milestone("Regerate initrd with result #{res}")
+ end
+
Builtins.y2debug("ret=%1", @ret)
Builtins.y2milestone("bootloader_finish finished")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.82/src/modules/BootStorage.rb
new/yast2-bootloader-3.1.85/src/modules/BootStorage.rb
--- old/yast2-bootloader-3.1.82/src/modules/BootStorage.rb 2014-08-06
11:17:45.000000000 +0200
+++ new/yast2-bootloader-3.1.85/src/modules/BootStorage.rb 2014-08-08
16:12:44.000000000 +0200
@@ -1552,6 +1552,23 @@
res = partitions.map do |partition|
Storage.GetDiskPartition(partition)["disk"]
end
+ res.uniq!
+ # handle LVM disks
+ tm = Storage.GetTargetMap
+ res = res.reduce([]) do |ret, disk|
+ disk_meta = tm[disk]
+ next unless disk_meta
+
+ if disk_meta["lvm2"]
+ devices = (disk_meta["devices"] || []) + (disk_meta["devices_add"]
|| [])
+ disks = devices.map { |d| real_disks_for_partition(d) }
+ ret.concat(disks.flatten)
+ else
+ ret << disk
+ end
+ ret
+ end
+
res.uniq
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.82/test/boot_storage_test.rb
new/yast2-bootloader-3.1.85/test/boot_storage_test.rb
--- old/yast2-bootloader-3.1.82/test/boot_storage_test.rb 2014-08-06
11:17:45.000000000 +0200
+++ new/yast2-bootloader-3.1.85/test/boot_storage_test.rb 2014-08-08
16:12:44.000000000 +0200
@@ -27,23 +27,51 @@
end
describe ".real_disks_for_partition" do
- it "returns unique list of disk on which partitions lives" do
- target_map_stub("storage_mdraid.rb")
+
+ before do
# simple mock getting disks from partition as it need initialized
libstorage
allow(Yast::Storage).to receive(:GetDiskPartition) do |partition|
- number = partition[/(\d+)$/,1]
- disk = partition[0..-(number.size+1)]
+ if partition == "/dev/system/root"
+ disk = "/dev/system"
+ number = "system"
+ else
+ number = partition[/(\d+)$/,1]
+ disk = partition[0..-(number.size+1)]
+ end
{ "disk" => disk, "nr" => number }
end
+ end
+
+ it "returns unique list of disk on which partitions lives" do
+ target_map_stub("storage_mdraid.rb")
+
+ result = Yast::BootStorage.real_disks_for_partition("/dev/vda1")
+ expect(result).to include("/dev/vda")
+ end
+
+ it "can handle md raid" do
+ target_map_stub("storage_mdraid.rb")
+
result = Yast::BootStorage.real_disks_for_partition("/dev/md1")
expect(result).to include("/dev/vda")
expect(result).to include("/dev/vdb")
expect(result).to include("/dev/vdc")
expect(result).to include("/dev/vdd")
+ end
- result = Yast::BootStorage.real_disks_for_partition("/dev/vda1")
+ it "can handle LVM" do
+ target_map_stub("storage_lvm.rb")
+
+ result = Yast::BootStorage.real_disks_for_partition("/dev/system/root")
+ expect(result).to include("/dev/vda")
+
+ #do not crash if target map do not contain devices_add(bnc#891070)
+ target_map_stub("storage_lvm_without_devices_add.rb")
+
+ result = Yast::BootStorage.real_disks_for_partition("/dev/system/root")
expect(result).to include("/dev/vda")
end
+
end
describe ".changeOrderInDeviceMapping" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.82/test/data/storage_lvm.rb
new/yast2-bootloader-3.1.85/test/data/storage_lvm.rb
--- old/yast2-bootloader-3.1.82/test/data/storage_lvm.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-bootloader-3.1.85/test/data/storage_lvm.rb 2014-08-08
16:12:44.000000000 +0200
@@ -0,0 +1,136 @@
+{
+ "/dev/btrfs" => {
+ "device" => "/dev/btrfs",
+ "name" => "btrfs",
+ "partitions" => [],
+ "type" => :CT_BTRFS,
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE
+ },
+ "/dev/system" => {
+ "create" => true,
+ "cyl_count" => 1795,
+ "cyl_size" => 4194304,
+ "device" => "/dev/system",
+ "devices" => [],
+ "devices_add" => ["/dev/vda3"],
+ "lvm2" => true,
+ "name" => "system",
+ "partitions" => [
+ {
+ "create" => true,
+ "detected_fs" => :btrfs,
+ "device" => "/dev/system/root",
+ "format" => true,
+ "fstype" => "LV",
+ "inactive" => true,
+ "mount" => "/",
+ "mountby" => :uuid,
+ "name" => "root",
+ "size_k" => 7352320,
+ "stripes" => 1,
+ "subvol" => [
+ { "create" => true, "name" => "@/boot/grub2/i386-pc" },
+ { "create" => true, "name" => "@/boot/grub2/x86_64-efi" },
+ { "create" => true, "name" => "@/home" },
+ { "create" => true, "name" => "@/opt" },
+ { "create" => true, "name" => "@/srv" },
+ { "create" => true, "name" => "@/tmp" },
+ { "create" => true, "name" => "@/usr/local" },
+ { "create" => true, "name" => "@/var/crash" },
+ { "create" => true, "name" => "@/var/lib/mailman" },
+ { "create" => true, "name" => "@/var/lib/named" },
+ { "create" => true, "name" => "@/var/lib/pgsql" },
+ { "create" => true, "name" => "@/var/log" },
+ { "create" => true, "name" => "@/var/opt" },
+ { "create" => true, "name" => "@/var/spool" },
+ { "create" => true, "name" => "@/var/tmp" }
+ ],
+ "type" => :lvm,
+ "used_by" => [{ "device" => "12345", "type" => :UB_BTRFS }],
+ "used_by_device" => "12345",
+ "used_by_type" => :UB_BTRFS,
+ "used_fs" => :btrfs,
+ "userdata" => { "/" => "snapshots" },
+ "uuid" => "12345"
+ }
+ ],
+ "pe_free" => 0,
+ "pesize" => 4194304,
+ "size_k" => 7352320,
+ "type" => :CT_LVM,
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE
+ },
+ "/dev/vda" => {
+ "bios_id" => "0x80",
+ "bus" => "None",
+ "cyl_count" => 1044,
+ "cyl_size" => 8225280,
+ "device" => "/dev/vda",
+ "driver" => "virtio-pci",
+ "driver_module" => "virtio_pci",
+ "label" => "gpt",
+ "max_logical" => 0,
+ "max_primary" => 15,
+ "name" => "vda",
+ "partitions" => [
+ {
+ "detected_fs" => :swap,
+ "device" => "/dev/vda1",
+ "fsid" => 263,
+ "fstype" => "BIOS Grub",
+ "name" => "vda1",
+ "nr" => 1,
+ "region" => [0, 1],
+ "size_k" => 1024,
+ "type" => :primary,
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE,
+ "used_fs" => :swap,
+ "uuid" => "3de29985-8cc6-4c9d-8562-2ede26b0c5b6"
+ },
+ {
+ "detected_fs" => :swap,
+ "device" => "/dev/vda2",
+ "fsid" => 130,
+ "fstype" => "Linux swap",
+ "inactive" => true,
+ "mount" => "swap",
+ "mountby" => :uuid,
+ "name" => "vda2",
+ "nr" => 2,
+ "region" => [1, 127],
+ "size_k" => 1026048,
+ "type" => :primary,
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE,
+ "used_fs" => :swap,
+ "uuid" => "ec8e9948-ca5f-4b18-a863-ac999365e4a9"
+ },
+ {
+ "boot" => true,
+ "detected_fs" => :unknown,
+ "device" => "/dev/vda3",
+ "fsid" => 142,
+ "fstype" => "Linux LVM",
+ "name" => "vda3",
+ "nr" => 3,
+ "region" => [127, 917],
+ "size_k" => 7359488,
+ "type" => :primary,
+ "used_by" => [{ "device" => "/dev/system", "type" => :UB_LVM }],
+ "used_by_device" => "/dev/system",
+ "used_by_type" => :UB_LVM
+ }
+ ],
+ "proposal_name" => "1. Disk, 8.00 GiB, /dev/vda, ",
+ "sector_size" => 512,
+ "size_k" => 8388608,
+ "transport" => :unknown,
+ "type" => :CT_DISK,
+ "unique" => "KSbE.Fxp0d3BezAE",
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.82/test/data/storage_lvm_without_devices_add.rb
new/yast2-bootloader-3.1.85/test/data/storage_lvm_without_devices_add.rb
--- old/yast2-bootloader-3.1.82/test/data/storage_lvm_without_devices_add.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-bootloader-3.1.85/test/data/storage_lvm_without_devices_add.rb
2014-08-08 16:12:44.000000000 +0200
@@ -0,0 +1,129 @@
+{
+ "/dev/btrfs" => {
+ "device" => "/dev/btrfs",
+ "name" => "btrfs",
+ "partitions" => [],
+ "type" => :CT_BTRFS,
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE
+ },
+ "/dev/system" => {
+ "create" => false,
+ "cyl_count" => 1947,
+ "cyl_size" => 4194304,
+ "device" => "/dev/system",
+ "devices" => ["/dev/vda2"],
+ "lvm2" => true,
+ "name" => "system",
+ "partitions" => [
+ {
+ "detected_fs" => :btrfs,
+ "device" => "/dev/system/root",
+ "format" => true,
+ "fstype" => "LV",
+ "inactive" => true,
+ "mount" => "/",
+ "mountby" => :uuid,
+ "name" => "root",
+ "size_k" => 7815168,
+ "stripes" => 1,
+ "subvol" => [
+ { "create" => true, "name" => "@/boot/grub2/i386-pc" },
+ { "create" => true, "name" => "@/boot/grub2/x86_64-efi" },
+ { "create" => true, "name" => "@/home" },
+ { "create" => true, "name" => "@/opt" },
+ { "create" => true, "name" => "@/srv" },
+ { "create" => true, "name" => "@/tmp" },
+ { "create" => true, "name" => "@/usr/local" },
+ { "create" => true, "name" => "@/var/crash" },
+ { "create" => true, "name" => "@/var/lib/mailman" },
+ { "create" => true, "name" => "@/var/lib/named" },
+ { "create" => true, "name" => "@/var/lib/pgsql" },
+ { "create" => true, "name" => "@/var/log" },
+ { "create" => true, "name" => "@/var/opt" },
+ { "create" => true, "name" => "@/var/spool" },
+ { "create" => true, "name" => "@/var/tmp" }
+ ],
+ "type" => :lvm,
+ "used_by" => [{ "device" => "12345", "type" => :UB_BTRFS }],
+ "used_by_device" => "12345",
+ "used_by_type" => :UB_BTRFS,
+ "used_fs" => :btrfs,
+ "uuid" => "12345"
+ },
+ {
+ "detected_fs" => :swap,
+ "device" => "/dev/system/swap",
+ "fstype" => "LV",
+ "inactive" => true,
+ "mount" => "swap",
+ "mountby" => :device,
+ "name" => "swap",
+ "size_k" => 155648,
+ "stripes" => 1,
+ "type" => :lvm,
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE,
+ "used_fs" => :swap,
+ "uuid" => "c47b159d-dc78-4069-9a55-9deae837478e"
+ }
+ ],
+ "pe_free" => 1,
+ "pesize" => 4194304,
+ "size_k" => 7974912,
+ "type" => :CT_LVM,
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE
+ },
+ "/dev/vda" => {
+ "bios_id" => "0x80",
+ "bus" => "None",
+ "cyl_count" => 1044,
+ "cyl_size" => 8225280,
+ "device" => "/dev/vda",
+ "driver" => "virtio-pci",
+ "driver_module" => "virtio_pci",
+ "label" => "gpt",
+ "max_logical" => 0,
+ "max_primary" => 15,
+ "name" => "vda",
+ "partitions" => [
+ {
+ "detected_fs" => :unknown,
+ "device" => "/dev/vda1",
+ "fsid" => 263,
+ "fstype" => "BIOS Grub",
+ "name" => "vda1",
+ "nr" => 1,
+ "region" => [0, 51],
+ "size_k" => 408576,
+ "type" => :primary,
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE
+ },
+ {
+ "boot" => true,
+ "detected_fs" => :unknown,
+ "device" => "/dev/vda2",
+ "fsid" => 131,
+ "fstype" => "Linux native",
+ "name" => "vda2",
+ "nr" => 2,
+ "region" => [50, 994],
+ "size_k" => 7977984,
+ "type" => :primary,
+ "used_by" => [{ "device" => "/dev/system", "type" => :UB_LVM }],
+ "used_by_device" => "/dev/system",
+ "used_by_type" => :UB_LVM
+ }
+ ],
+ "proposal_name" => "1. Disk, 8.00 GiB, /dev/vda, ",
+ "sector_size" => 512,
+ "size_k" => 8388608,
+ "transport" => :unknown,
+ "type" => :CT_DISK,
+ "unique" => "KSbE.Fxp0d3BezAE",
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE
+ }
+}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
