Hello community,
here is the log from the commit of package transactional-update for
openSUSE:Factory checked in at 2019-03-27 16:14:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
and /work/SRC/openSUSE:Factory/.transactional-update.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transactional-update"
Wed Mar 27 16:14:40 2019 rev:41 rq:688399 version:2.14.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes
2019-03-19 09:57:32.292123545 +0100
+++
/work/SRC/openSUSE:Factory/.transactional-update.new.25356/transactional-update.changes
2019-03-27 16:14:44.919616363 +0100
@@ -1,0 +2,9 @@
+Mon Mar 25 14:53:12 UTC 2019 - Ignaz Forster <[email protected]>
+
+- Update to version 2.14.1
+ - Improve non-root fs changes checker based on feedback
+ - Disable snapper's zypper plugin during transactional-update run
+- Allow parallel installation with snapper's zypper plugin (useful on
+ read-write systems).
+
+-------------------------------------------------------------------
Old:
----
transactional-update-2.14.tar.gz
New:
----
transactional-update-2.14.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.HdX8HD/_old 2019-03-27 16:14:46.115616058 +0100
+++ /var/tmp/diff_new_pack.HdX8HD/_new 2019-03-27 16:14:46.119616057 +0100
@@ -17,7 +17,7 @@
Name: transactional-update
-Version: 2.14
+Version: 2.14.1
Release: 0
# test
Summary: Transactional Updates with btrfs and snapshots
@@ -42,7 +42,6 @@
# psmisc is needed because of fuser
Requires: psmisc
Requires: rsync
-Conflicts: snapper-zypp-plugin
Recommends: rebootmgr
%description
++++++ transactional-update-2.14.tar.gz -> transactional-update-2.14.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.14/NEWS
new/transactional-update-2.14.1/NEWS
--- old/transactional-update-2.14/NEWS 2019-03-15 11:36:06.000000000 +0100
+++ new/transactional-update-2.14.1/NEWS 2019-03-25 18:55:33.000000000
+0100
@@ -1,6 +1,10 @@
transactional-update NEWS -- history of user-visible changes.
-Copyright (C) 2016-2019 Thorsten Kukuk
+Copyright (C) 2016-2019 Thorsten Kukuk et al.
+
+Version 2.14.1
+* Improve non-root fs changes checker based on feedback
+* Disable snapper's zypper plugin during transactional-update run
Version 2.14
* Warn user if contents of /var have been changed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.14/configure.ac
new/transactional-update-2.14.1/configure.ac
--- old/transactional-update-2.14/configure.ac 2019-03-15 11:36:06.000000000
+0100
+++ new/transactional-update-2.14.1/configure.ac 2019-03-25
18:55:33.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 2.14)
+AC_INIT(transactional-update, 2.14.1)
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.14/man/transactional-update.8.xml
new/transactional-update-2.14.1/man/transactional-update.8.xml
--- old/transactional-update-2.14/man/transactional-update.8.xml
2019-03-15 11:36:06.000000000 +0100
+++ new/transactional-update-2.14.1/man/transactional-update.8.xml
2019-03-25 18:55:33.000000000 +0100
@@ -121,7 +121,7 @@
On <emphasis>read-write systems</emphasis> please be aware that all changes
done to the running root filesystem after snapshot creation are lost after the
next reboot. For this reason the system should be rebooted as fast as possible
-after an successfull update.
+after a successful update.
</para>
<para>For easier maintenance of big clusters,
<command>transactional-update</command> is run by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-2.14/sbin/transactional-update.in
new/transactional-update-2.14.1/sbin/transactional-update.in
--- old/transactional-update-2.14/sbin/transactional-update.in 2019-03-15
11:36:06.000000000 +0100
+++ new/transactional-update-2.14.1/sbin/transactional-update.in
2019-03-25 18:55:33.000000000 +0100
@@ -19,6 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
export LANG=C
+export DISABLE_SNAPPER_ZYPP_PLUGIN=1
DIR_TO_MOUNT="dev opt var/log"
EXITCODE=0
@@ -54,6 +55,7 @@
LOCKFILE="/var/run/transactional-update.pid"
ZYPPER_AUTO_IMPORT_KEYS=0
ETC_OVERLAY_PATTERN='^[^[:space:]]\+[[:space:]]\+\/etc[[:space:]]\+overlay[[:space:]]\+\([^[:space:]]*,\|\)workdir=\/sysroot\/var\/lib\/overlay\/work-etc[,[:space:]]'
+NON_ROOTFS_WHITELIST=("/var/lib/systemd/migrated" "/var/run/zypp.pid")
# Load config
if [ -r ${SYSTEMCONFFILE} ]; then
@@ -1257,18 +1259,32 @@
EXITCODE=1
fi
- # Check for installation artefacts in /var, but filter out acceptable hits
- if [ ${HAS_SEPARATE_VAR} -eq 1 ]; then
- filelist="$(find ${SNAPSHOT_DIR}/var \
- -not \( -path ${SNAPSHOT_DIR}/var/lib/systemd/migrated -prune
\) \
- -not \( -path ${SNAPSHOT_DIR}/var/run/zypp.pid -prune \) \
- -cnewer ${LOCKFILE} -not -type d)"
- if [ -n "${filelist}" ]; then
- echo
- echo "Warning: The following files in /var were changed in the
snapshot, but"
- echo "will not be visible to the system:"
- echo "${filelist}"
- echo
+ # Check for installation artefacts: Packages may have created files in
+ # directories outside of the root file system; these files will not be
+ # visible in the actual system as they are shadowed by the real mount
+ # points, so warn the user
+ searchdirs=""
+ for mountdir in $(awk '$2 ~ "^/.*" { print $2 }'
${SNAPSHOT_DIR}/etc/fstab); do
+ # Filter out root fs and fstab entries which we bind mounted anyway
+ if [[ ! $mountdir =~ ^(/|/etc|${DIR_TO_MOUNT// /|})$ ]]; then
+ searchdirs+="${SNAPSHOT_DIR}${mountdir} "
+ fi
+ done
+ if [ -n "${searchdirs}" ]; then
+ filelist="$(find ${searchdirs} -cnewer ${LOCKFILE} -not -type d
2>/dev/null)"
+ # Filter acceptable hits
+ whitelist=""
+ for wlentry in "${NON_ROOTFS_WHITELIST[@]}"; do
+ whitelist+="${SNAPSHOT_DIR}${wlentry}\|"
+ done
+ filelist="$(echo "$filelist" | grep -v "^\(${whitelist::-2}\)")"
+
+ if [ -n "$filelist" ]; then
+ log_info
+ log_info "Warning: The following files were changed in the
snapshot, but are shadowed by"
+ log_info "other mounts and will not be visible to the system:"
+ log_info "${filelist}"
+ log_info
fi
fi
