Hello community,
here is the log from the commit of package yast2-update for openSUSE:Factory
checked in at 2020-01-11 14:47:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-update (Old)
and /work/SRC/openSUSE:Factory/.yast2-update.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update"
Sat Jan 11 14:47:26 2020 rev:135 rq:761522 version:4.2.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes
2019-12-14 12:03:05.887406153 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-update.new.6675/yast2-update.changes
2020-01-11 14:47:32.205362483 +0100
@@ -1,0 +2,9 @@
+Fri Jan 3 14:51:57 CET 2020 - sch...@suse.de
+
+- Aborting upgrade: Restoring old settings e.g. RPM database
+ (bsc#1158914).
+- mount /run and efivars into target to fix hanging LVM (bsc#1148500)
+ by Steffen Winterfeldt <snw...@suse.com>
+- 4.2.13
+
+-------------------------------------------------------------------
Old:
----
yast2-update-4.2.12.tar.bz2
New:
----
yast2-update-4.2.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.s6PPgh/_old 2020-01-11 14:47:32.825362725 +0100
+++ /var/tmp/diff_new_pack.s6PPgh/_new 2020-01-11 14:47:32.829362726 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-update
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-update
-Version: 4.2.12
+Version: 4.2.13
Release: 0
Summary: YaST2 - Update
License: GPL-2.0-only
++++++ yast2-update-4.2.12.tar.bz2 -> yast2-update-4.2.13.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-4.2.12/package/yast2-update.changes
new/yast2-update-4.2.13/package/yast2-update.changes
--- old/yast2-update-4.2.12/package/yast2-update.changes 2019-12-04
16:52:39.000000000 +0100
+++ new/yast2-update-4.2.13/package/yast2-update.changes 2020-01-07
11:52:53.000000000 +0100
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Fri Jan 3 14:51:57 CET 2020 - sch...@suse.de
+
+- Aborting upgrade: Restoring old settings e.g. RPM database
+ (bsc#1158914).
+- mount /run and efivars into target to fix hanging LVM (bsc#1148500)
+ by Steffen Winterfeldt <snw...@suse.com>
+- 4.2.13
+
+-------------------------------------------------------------------
Wed Dec 4 14:29:12 UTC 2019 - Josef Reidinger <jreidin...@suse.com>
- fix upgrade for online medium (bsc#1158056 and bsc#1157636)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-4.2.12/package/yast2-update.spec
new/yast2-update-4.2.13/package/yast2-update.spec
--- old/yast2-update-4.2.12/package/yast2-update.spec 2019-12-04
16:52:39.000000000 +0100
+++ new/yast2-update-4.2.13/package/yast2-update.spec 2020-01-07
11:52:53.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-update
-Version: 4.2.12
+Version: 4.2.13
Release: 0
Summary: YaST2 - Update
Group: System/YaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-update-4.2.12/src/clients/inst_update_partition.rb
new/yast2-update-4.2.13/src/clients/inst_update_partition.rb
--- old/yast2-update-4.2.12/src/clients/inst_update_partition.rb
2019-12-04 16:52:39.000000000 +0100
+++ new/yast2-update-4.2.13/src/clients/inst_update_partition.rb
2020-01-07 11:52:53.000000000 +0100
@@ -51,11 +51,7 @@
save_installation_repos
end
- if RootPart.Mounted
- Update.restore_backup
- Update.Detach
- RootPart.UnmountPartitions(false)
- end
+ restore_installed_system
RootPart.Detect
@@ -69,11 +65,23 @@
@ret = :finish if @ret == :next
end
+ restore_installed_system if @ret == :abort
+
@ret
end
private
+ # Restoring old settings in the mounted, installed system
+ # which have already been changed while the upgrade process.
+ def restore_installed_system
+ return unless RootPart.Mounted
+
+ Update.restore_backup
+ Update.Detach
+ RootPart.UnmountPartitions(false)
+ end
+
# restore the repository setup from the saved config
def restore_installation_repos
log.info("Restoring the initial repository setup")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-4.2.12/src/modules/RootPart.rb
new/yast2-update-4.2.13/src/modules/RootPart.rb
--- old/yast2-update-4.2.12/src/modules/RootPart.rb 2019-12-04
16:52:39.000000000 +0100
+++ new/yast2-update-4.2.13/src/modules/RootPart.rb 2020-01-07
11:52:53.000000000 +0100
@@ -34,7 +34,7 @@
module Yast
class RootPartClass < Module
include Logger
- NON_MODULAR_FS = ["devtmpfs", "proc", "sysfs"].freeze
+ NON_MODULAR_FS = ["devtmpfs", "none", "proc", "sysfs"].freeze
def main
Yast.import "UI"
@@ -490,6 +490,7 @@
mnt_opts << " -t #{mount_type}" if mount_type != ""
Builtins.y2milestone("mount options '#{mnt_opts}'")
+ Builtins.y2milestone("mount #{mnt_opts} #{device} #{Installation.destdir
+ mount_point}")
ret = Convert.to_boolean(
SCR.Execute(
@@ -523,7 +524,7 @@
end
Builtins.y2milestone(
- "mounting (%1, %2, %3) yield %4",
+ "mounting (%1, %2, %3) yields %4",
Ops.add(Installation.destdir, mount_point),
device,
mount_type,
@@ -802,6 +803,13 @@
)
end
+ # bind-mount /run into chroot (bsc#1152530)
+ if MountPartition("/run", "/run", "none", "bind").nil?
+ AddMountedPartition(
+ type: "mount", device: "none", mntpt: "/run"
+ )
+ end
+
efivars_path = "/sys/firmware/efi/efivars"
if ::File.exist?(efivars_path)
if MountPartition(efivars_path, "efivarfs", "efivarfs").nil?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-4.2.12/test/root_part_test.rb
new/yast2-update-4.2.13/test/root_part_test.rb
--- old/yast2-update-4.2.12/test/root_part_test.rb 2019-12-04
16:52:39.000000000 +0100
+++ new/yast2-update-4.2.13/test/root_part_test.rb 2020-01-07
11:52:53.000000000 +0100
@@ -235,14 +235,14 @@
let(:device_spec) { nil }
- it "mounts /dev, /proc and /sys" do
+ it "mounts /dev, /proc, /run, and /sys" do
allow(subject).to receive(:AddMountedPartition)
- ["/dev", "/proc", "/sys"].each do |d|
- expect(subject).to receive(:MountPartition).with(d, anything, anything)
+ ["/dev", "/proc", "/run", "/sys"].each do |d|
+ expect(subject).to receive(:MountPartition).with(d, anything,
anything, any_args)
end
- # call with empty list to only test the /dev, /proc and /sys mounting
+ # call with empty list to only test the /dev, /proc, /run, and /sys
mounting
fstab = []
subject.MountFSTab(fstab, "")
end
