Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2014-10-29 21:10:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-19 19:27:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes
2014-10-29 21:11:40.000000000 +0100
@@ -1,0 +2,26 @@
+Wed Oct 29 14:13:52 UTC 2014 - jreidin...@suse.com
+
+- do not return /dev/null if cannot detect bootloader devices as it
+ cause errors later
+
+-------------------------------------------------------------------
+Wed Oct 29 13:18:10 UTC 2014 - jreidin...@suse.com
+
+- do not show warning if boot from extended partition (bnc#898023)
+- 3.1.108
+
+-------------------------------------------------------------------
+Wed Oct 29 07:16:22 UTC 2014 - jreidin...@suse.com
+
+- fix branding activation on live CD and also with kexec enabled
+ (bnc#897847)
+- 3.1.107
+
+-------------------------------------------------------------------
+Fri Oct 24 14:30:20 UTC 2014 - jreidin...@suse.com
+
+- fix crash during installation if kernel parameter is not
+ pre-proposed (bnc#902397)
+- 3.1.106
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-3.1.105.tar.bz2
New:
----
yast2-bootloader-3.1.108.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.IHzFnw/_old 2014-10-29 21:11:41.000000000 +0100
+++ /var/tmp/diff_new_pack.IHzFnw/_new 2014-10-29 21:11:41.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.105
+Version: 3.1.108
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -133,7 +133,7 @@
%dir %{yast_docdir}
%doc %{yast_docdir}/COPYING
-%doc %{yast_docdir}/README
+%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
%files devel-doc
++++++ yast2-bootloader-3.1.105.tar.bz2 -> yast2-bootloader-3.1.108.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.105/.travis.yml
new/yast2-bootloader-3.1.108/.travis.yml
--- old/yast2-bootloader-3.1.105/.travis.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-bootloader-3.1.108/.travis.yml 2014-10-29 15:32:14.000000000
+0100
@@ -0,0 +1,16 @@
+language: cpp
+compiler:
+ - gcc
+before_install:
+ - curl
http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04/Release.key
| sudo apt-key add -
+ - echo "deb
http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04/ ./"
| sudo tee -a /etc/apt/sources.list
+ - sudo apt-get update -q
+ - sudo apt-get install --no-install-recommends -y yast2 yast2-storage
+ # disable rvm, use system Ruby
+ - rvm reset
+ - sudo gem install rake yast-rake yard rspec:2.14.1
+script:
+ - yardoc
+ - rake test:unit
+ - sudo rake install
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.105/README
new/yast2-bootloader-3.1.108/README
--- old/yast2-bootloader-3.1.105/README 2014-10-16 08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-yast2-bootloader is part of YaST2
-See the file COPYRIGHT.english for license terms
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.105/README.md
new/yast2-bootloader-3.1.108/README.md
--- old/yast2-bootloader-3.1.105/README.md 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-bootloader-3.1.108/README.md 2014-10-29 15:32:14.000000000
+0100
@@ -0,0 +1,5 @@
+# YaST - The Bootloader Module #
+
+[](https://travis-ci.org/yast/yast-bootloader)
+[](https://ci.opensuse.org/view/Yast/job/yast-bootloader-master/)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.105/package/yast2-bootloader.changes
new/yast2-bootloader-3.1.108/package/yast2-bootloader.changes
--- old/yast2-bootloader-3.1.105/package/yast2-bootloader.changes
2014-10-16 08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/package/yast2-bootloader.changes
2014-10-29 15:32:14.000000000 +0100
@@ -1,4 +1,30 @@
-------------------------------------------------------------------
+Wed Oct 29 14:13:52 UTC 2014 - jreidin...@suse.com
+
+- do not return /dev/null if cannot detect bootloader devices as it
+ cause errors later
+
+-------------------------------------------------------------------
+Wed Oct 29 13:18:10 UTC 2014 - jreidin...@suse.com
+
+- do not show warning if boot from extended partition (bnc#898023)
+- 3.1.108
+
+-------------------------------------------------------------------
+Wed Oct 29 07:16:22 UTC 2014 - jreidin...@suse.com
+
+- fix branding activation on live CD and also with kexec enabled
+ (bnc#897847)
+- 3.1.107
+
+-------------------------------------------------------------------
+Fri Oct 24 14:30:20 UTC 2014 - jreidin...@suse.com
+
+- fix crash during installation if kernel parameter is not
+ pre-proposed (bnc#902397)
+- 3.1.106
+
+-------------------------------------------------------------------
Wed Oct 15 11:50:20 UTC 2014 - jreidin...@suse.com
- improve usability of device map editor (bnc#900807)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.105/package/yast2-bootloader.spec
new/yast2-bootloader-3.1.108/package/yast2-bootloader.spec
--- old/yast2-bootloader-3.1.105/package/yast2-bootloader.spec 2014-10-16
08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/package/yast2-bootloader.spec 2014-10-29
15:32:14.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.105
+Version: 3.1.108
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -117,7 +117,7 @@
%dir %{yast_docdir}
%doc %{yast_docdir}/COPYING
-%doc %{yast_docdir}/README
+%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
%files devel-doc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.105/src/clients/bootloader_finish.rb
new/yast2-bootloader-3.1.108/src/clients/bootloader_finish.rb
--- old/yast2-bootloader-3.1.105/src/clients/bootloader_finish.rb
2014-10-16 08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/src/clients/bootloader_finish.rb
2014-10-29 15:32:14.000000000 +0100
@@ -167,6 +167,25 @@
@retcode = Bootloader.WriteInstallation
else
@retcode = Bootloader.Update
+
+ # 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
+ res = SCR.Execute(path(".target.bash_output"), "/sbin/mkinitrd")
+ Builtins.y2milestone("Regerate initrd with result #{res}")
+ end
+
+ # FIXME workaround grub2 need manual rerun of branding due to
overwrite by
+ # pbl. see bnc#879686 and bnc#901003
+ if 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}")
+ res = SCR.Execute(path(".target.bash_output"),
"/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg")
+ Builtins.y2milestone("Regenerating config for branding with result
#{res}")
+ end
end
if @retcode
@@ -185,8 +204,7 @@
# (bnc #381192) don't use it if kexec is used
# update calling onetime boot bnc #339024
if !@retcode
- @bl = Bootloader.getLoaderType
- return Bootloader.FlagOnetimeBoot(Bootloader.getDefaultSection)
+ @ret = Bootloader.FlagOnetimeBoot(Bootloader.getDefaultSection)
end
else
return @retcode
@@ -196,25 +214,6 @@
@ret = nil
end
- # FIXME workaround grub2 need manual rerun of branding due to overwrite
by
- # pbl. see bnc#879686 and bnc#901003
- if 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
- # 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")
deep_copy(@ret)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.105/src/include/bootloader/grub2/misc.rb
new/yast2-bootloader-3.1.108/src/include/bootloader/grub2/misc.rb
--- old/yast2-bootloader-3.1.105/src/include/bootloader/grub2/misc.rb
2014-10-16 08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/src/include/bootloader/grub2/misc.rb
2014-10-29 15:32:14.000000000 +0100
@@ -395,7 +395,7 @@
bldevs = BootCommon.GetBootloaderDevices
need_location_reconfigure = false
- if bldevs == nil || bldevs == ["/dev/null"]
+ if bldevs.empty?
need_location_reconfigure = true
else
Builtins.foreach(bldevs) do |dev|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.105/src/include/bootloader/routines/misc.rb
new/yast2-bootloader-3.1.108/src/include/bootloader/routines/misc.rb
--- old/yast2-bootloader-3.1.105/src/include/bootloader/routines/misc.rb
2014-10-16 08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/src/include/bootloader/routines/misc.rb
2014-10-29 15:32:14.000000000 +0100
@@ -145,9 +145,9 @@
if @globals["boot_custom"]
ret << @globals["boot_custom"]
end
- return ret unless ret.empty?
- # FIXME: find out what the best value is here: nil, [] or ["/dev/null"]
- ["/dev/null"]
+ Builtins.y2warning("Empty bootloader devices. Globals
#{@globals.inspect}") if ret.empty?
+
+ ret
end
# get kernel parameter from kernel command line
@@ -158,6 +158,8 @@
def getKernelParamFromLine(line, key)
# FIXME this doesn't work with quotes and spaces
res = "false"
+ # we can get nil if params is not yet proposed, so return not there
(bnc#902397)
+ return res unless line
params = line.split(" ").reject(&:empty?)
params.each do |p|
l = p.split("=")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.105/src/modules/BootGRUB2.rb
new/yast2-bootloader-3.1.108/src/modules/BootGRUB2.rb
--- old/yast2-bootloader-3.1.105/src/modules/BootGRUB2.rb 2014-10-16
08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/src/modules/BootGRUB2.rb 2014-10-29
15:32:14.000000000 +0100
@@ -229,7 +229,7 @@
line << "</li>"
end
- if ["boot_root", "boot_boot", "boot_mbr"].none? { |loc|
BootCommon.globals[loc] == "true" }
+ if ["boot_root", "boot_boot", "boot_mbr", "boot_extended"].none? { |loc|
BootCommon.globals[loc] == "true" }
# no location chosen, so warn user that it is problem unless he is
sure
msg = _("Warning: No location for bootloader stage1 selected." \
"Unless you know what you are doing please select above location.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.105/src/modules/Bootloader.rb
new/yast2-bootloader-3.1.108/src/modules/Bootloader.rb
--- old/yast2-bootloader-3.1.105/src/modules/Bootloader.rb 2014-10-16
08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/src/modules/Bootloader.rb 2014-10-29
15:32:14.000000000 +0100
@@ -934,7 +934,7 @@
WFM.Execute(path(".local.mkdir"), "/var/lib/YaST2")
cmd = Builtins.sformat(
- "/bin/cp -L %1%2 %1%3 %4",
+ "/bin/cp -L %1/%2 %1/%3 %4",
Installation.destdir,
"vmlinuz",
"initrd",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-3.1.105/test/data/storage_encrypted.rb
new/yast2-bootloader-3.1.108/test/data/storage_encrypted.rb
--- old/yast2-bootloader-3.1.105/test/data/storage_encrypted.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-bootloader-3.1.108/test/data/storage_encrypted.rb 2014-10-29
15:32:14.000000000 +0100
@@ -0,0 +1,157 @@
+{
+ "/dev/sda" => {
+ "bios_id" => "0x80",
+ "bus" => "IDE",
+ "cyl_count" => 1827,
+ "cyl_size" => 8225280,
+ "device" => "/dev/sda",
+ "driver" => "ahci",
+ "driver_module" => "ahci",
+ "label" => "msdos",
+ "max_logical" => 255,
+ "max_primary" => 4,
+ "model" => "HARDDISK",
+ "name" => "sda",
+ "partitions" => [
+ {
+ "create" => true,
+ "crypt_device" => "/dev/mapper/cr_swap",
+ "detected_fs" => :swap,
+ "device" => "/dev/sda1",
+ "enc_type" => :luks,
+ "format" => true,
+ "fsid" => 130,
+ "fstopt" => "defaults",
+ "fstype" => "Linux swap",
+ "inactive" => true,
+ "mount" => "swap",
+ "mountby" => :device,
+ "name" => "sda1",
+ "nr" => 1,
+ "region" => [0, 261],
+ "size_k" => 2096482,
+ "type" => :primary,
+ "udev_id" => [
+ "ata-VBOX_HARDDISK_VB7c7aa34e-2f09570d-part1",
+ "scsi-0ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part1",
+ "scsi-1ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part1",
+ "scsi-SATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part1"
+ ],
+ "udev_path" => "pci-0000:00:0d.0-ata-1.0-part1",
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE,
+ "used_fs" => :swap
+ },
+ {
+ "create" => true,
+ "detected_fs" => :unknown,
+ "device" => "/dev/sda2",
+ "format" => true,
+ "fs_options" => {
+ "opt_dir_index" => {
+ "option_cmd" => :mkfs,
+ "option_str" => "-O dir_index",
+ "option_value" => true
+ },
+ "opt_reg_checks" => {
+ "option_cmd" => :tunefs,
+ "option_str" => "-c 0 -i 0",
+ "option_value" => true
+ },
+ "opt_reserved_blocks" => {
+ "option_cmd" => :mkfs,
+ "option_str" => "-m",
+ "option_value" => "5.0"
+ }
+ },
+ "fsid" => 131,
+ "fstopt" => "acl,user_xattr",
+ "fstype" => "Linux native",
+ "inactive" => true,
+ "mkfs_opt" => "-O dir_index -m5.0",
+ "mount" => "/boot",
+ "mountby" => :uuid,
+ "name" => "sda2",
+ "nr" => 2,
+ "region" => [261, 25],
+ "size_k" => 200812,
+ "tunefs_opt" => "-c 0 -i 0",
+ "type" => :primary,
+ "udev_id" => [
+ "ata-VBOX_HARDDISK_VB7c7aa34e-2f09570d-part2",
+ "scsi-0ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part2",
+ "scsi-1ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part2",
+ "scsi-SATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part2"
+ ],
+ "udev_path" => "pci-0000:00:0d.0-ata-1.0-part2",
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE,
+ "used_fs" => :ext4,
+ "userdata" => { "/" => "snapshots" }
+ },
+ {
+ "create" => true,
+ "detected_fs" => :unknown,
+ "device" => "/dev/sda3",
+ "format" => true,
+ "fs_options" => {
+ "opt_dir_index" => {
+ "option_cmd" => :mkfs,
+ "option_str" => "-O dir_index",
+ "option_value" => true
+ },
+ "opt_reg_checks" => {
+ "option_cmd" => :tunefs,
+ "option_str" => "-c 0 -i 0",
+ "option_value" => true
+ },
+ "opt_reserved_blocks" => {
+ "option_cmd" => :mkfs,
+ "option_str" => "-m",
+ "option_value" => "5.0"
+ }
+ },
+ "fsid" => 131,
+ "fstopt" => "acl,user_xattr",
+ "fstype" => "Linux native",
+ "inactive" => true,
+ "mkfs_opt" => "-O dir_index -m5.0",
+ "mount" => "/",
+ "mountby" => :uuid,
+ "name" => "sda3",
+ "nr" => 3,
+ "region" => [286, 1540],
+ "size_k" => 12370050,
+ "tunefs_opt" => "-c 0 -i 0",
+ "type" => :primary,
+ "udev_id" => [
+ "ata-VBOX_HARDDISK_VB7c7aa34e-2f09570d-part3",
+ "scsi-0ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part3",
+ "scsi-1ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part3",
+ "scsi-SATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part3"
+ ],
+ "udev_path" => "pci-0000:00:0d.0-ata-1.0-part3",
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE,
+ "used_fs" => :ext4,
+ "userdata" => { "/" => "snapshots" }
+ }
+ ],
+ "proposal_name" => "1. IDE Disk, 14.00 GiB, /dev/sda, VBOX-HARDDISK",
+ "sector_size" => 512,
+ "size_k" => 14680064,
+ "transport" => :sata,
+ "type" => :CT_DISK,
+ "udev_id" => [
+ "ata-VBOX_HARDDISK_VB7c7aa34e-2f09570d",
+ "scsi-0ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d",
+ "scsi-1ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d",
+ "scsi-SATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d"
+ ],
+ "udev_path" => "pci-0000:00:0d.0-ata-1.0",
+ "unique" => "3OOL.LBw4GrqrKS7",
+ "used_by_device" => "",
+ "used_by_type" => :UB_NONE,
+ "vendor" => "VBOX"
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.105/test/device_mapping_test.rb
new/yast2-bootloader-3.1.108/test/device_mapping_test.rb
--- old/yast2-bootloader-3.1.105/test/device_mapping_test.rb 2014-10-16
08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/test/device_mapping_test.rb 2014-10-29
15:32:14.000000000 +0100
@@ -49,6 +49,9 @@
when "/dev/system/root"
disk = "/dev/system"
number = "system"
+ when "/dev/mapper/cr_swap"
+ disk = "/dev/mapper/cr_swap"
+ number = ""
when "tmpfs"
disk = "tmpfs"
number = ""
@@ -74,6 +77,13 @@
expect(subject.to_mountby_device("/dev/vda2")).to eq
"/dev/disk/by-uuid/ec8e9948-ca5f-4b18-a863-ac999365e4a9"
end
+ it "returns encrypted device name if device have it" do
+ target_map_stub("storage_encrypted.rb")
+ allow(Yast::Storage).to receive(:GetDefaultMountBy).and_return(:uuid)
+
+ expect(subject.to_mountby_device("/dev/mapper/cr_swap")).to eq
"/dev/mapper/cr_swap"
+ end
+
it "returns kernel device name if requested udev mapping do not exists" do
target_map_stub("storage_lvm.rb")
expect(Yast::Storage).to receive(:GetDefaultMountBy).and_return(:id)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-3.1.105/test/mbr_update_test.rb
new/yast2-bootloader-3.1.108/test/mbr_update_test.rb
--- old/yast2-bootloader-3.1.105/test/mbr_update_test.rb 2014-10-16
08:02:11.000000000 +0200
+++ new/yast2-bootloader-3.1.108/test/mbr_update_test.rb 2014-10-29
15:32:14.000000000 +0100
@@ -64,11 +64,6 @@
receive(:new).with("/dev/sda").and_return(backup_mock)
)
expect(backup_mock).to receive(:write)
- #FIXME avoid stupid /dev/null behavior
- expect(::Bootloader::BootRecordBackup).to(
- receive(:new).with("/dev/null").
- and_return(double(:write => true))
- )
subject.run
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
