Hello community,
here is the log from the commit of package transactional-update for
openSUSE:Factory checked in at 2020-03-27 21:55:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
and /work/SRC/openSUSE:Factory/.transactional-update.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transactional-update"
Fri Mar 27 21:55:49 2020 rev:52 rq:788446 version:2.20.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes
2020-03-16 10:16:53.635551936 +0100
+++
/work/SRC/openSUSE:Factory/.transactional-update.new.3160/transactional-update.changes
2020-03-27 21:56:11.998754450 +0100
@@ -1,0 +2,8 @@
+Thu Mar 26 08:21:24 UTC 2020 - Ignaz Forster <[email protected]>
+
+- Update to version 2.20.4
+ - Mount efivarfs on EFI systems to make sure the bootloader will be installed
+ correctly [boo#1162320]
+ - Fix removal of existing overlay directories
+
+-------------------------------------------------------------------
Old:
----
transactional-update-2.20.3.tar.gz
New:
----
transactional-update-2.20.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.E486SO/_old 2020-03-27 21:56:13.042755057 +0100
+++ /var/tmp/diff_new_pack.E486SO/_new 2020-03-27 21:56:13.046755060 +0100
@@ -17,7 +17,7 @@
Name: transactional-update
-Version: 2.20.3
+Version: 2.20.4
Release: 0
Summary: Transactional Updates with btrfs and snapshots
License: GPL-2.0-or-later
++++++ transactional-update-2.20.3.tar.gz -> transactional-update-2.20.4.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.20.3/NEWS
new/transactional-update-2.20.4/NEWS
--- old/transactional-update-2.20.3/NEWS 2020-03-03 17:27:07.000000000
+0100
+++ new/transactional-update-2.20.4/NEWS 2020-03-26 09:18:09.000000000
+0100
@@ -2,9 +2,14 @@
Copyright (C) 2016-2019 Thorsten Kukuk et al.
+Version 2.20.4
+* Mount efivarfs on EFI systems to make sure the bootloader will be installed
+ correctly.
+* Fix removal of existing overlay directories
+
Version 2.20.3
* Reintroduce compatibility with RPM < 4.15 for inclusion in SLE / Leap 15.2
-* Prepare for removal of /var/lib/alternatives [jsc#SLE-9810]
+* Prepare for removal of /var/lib/alternatives [jsc#SLE-9101]
Version 2.20.2
* Use full names for zypper options [bsc#1164543]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.20.3/configure.ac
new/transactional-update-2.20.4/configure.ac
--- old/transactional-update-2.20.3/configure.ac 2020-03-03
17:27:07.000000000 +0100
+++ new/transactional-update-2.20.4/configure.ac 2020-03-26
09:18:09.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 2.20.3)
+AC_INIT(transactional-update, 2.20.4)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([sbin/transactional-update.in])
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-2.20.3/sbin/transactional-update.in
new/transactional-update-2.20.4/sbin/transactional-update.in
--- old/transactional-update-2.20.3/sbin/transactional-update.in
2020-03-03 17:27:07.000000000 +0100
+++ new/transactional-update-2.20.4/sbin/transactional-update.in
2020-03-26 09:18:09.000000000 +0100
@@ -992,7 +992,7 @@
# If the user is calling `snapper delete` on the latest snapshot, then
# the snapshot number will be reused; make sure to delete any artifacts
- rm -f "${ETC_OVERLAY_DIR}"
+ rm -rf "${ETC_OVERLAY_DIR}"
mkdir -p "${ETC_OVERLAY_DIR}" "${ETC_OVERLAY_WORK_DIR}"
@@ -1078,14 +1078,6 @@
DIR_TO_MOUNT="${DIR_TO_MOUNT} /boot/writable"
fi
- # Check which directories in /boot/grub2 need to be mounted,
- # otherwise grub2 will not boot after a version update.
- DIR_TO_MOUNT="${DIR_TO_MOUNT} $(awk '$2 ~ /^\/boot\/grub2\// { print $2 }'
/proc/mounts)"
- # On EFI systems the EFI partition is also needed
- if [ -e /boot/efi ]; then
- DIR_TO_MOUNT="${DIR_TO_MOUNT} /boot/efi"
- fi
-
# Mount everything we need:
mount -t proc none ${SNAPSHOT_DIR}/proc
if [ $? -ne 0 ]; then
@@ -1097,6 +1089,22 @@
log_error "ERROR: mount of sys failed!"
quit 1
fi
+
+ # Check which directories in /boot/grub2 need to be mounted,
+ # otherwise grub2 will not boot after a version update.
+ DIR_TO_MOUNT="${DIR_TO_MOUNT} $(awk '$2 ~ /^\/boot\/grub2\// { print $2 }'
/proc/mounts)"
+ # On EFI systems the EFI partition is also required
+ if [ -e /boot/efi ]; then
+ DIR_TO_MOUNT="${DIR_TO_MOUNT} /boot/efi"
+ # Additionally the EFI variables have to be visible, otherwise pbl will
+ # set an incorrect installation location [boo#1162320].
+ mount -t efivarfs efivarfs ${SNAPSHOT_DIR}/sys/firmware/efi/efivars
+ if [ $? -ne 0 ]; then
+ log_error "ERROR: mount of efivarfs failed!"
+ quit 1
+ fi
+ fi
+
if [ ${ETC_IS_OVERLAY} -eq 1 ]; then
lowerdir="${fstab_upper///sysroot\/var//var}:"
lowerdir+="`parse_lowerdirs_for_mount
"/.snapshots/${BASE_SNAPSHOT_ID}/snapshot"`"
