Hello community,
here is the log from the commit of package transactional-update for
openSUSE:Factory checked in at 2020-03-30 22:51:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
and /work/SRC/openSUSE:Factory/.transactional-update.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transactional-update"
Mon Mar 30 22:51:44 2020 rev:53 rq:789758 version:2.21
Changes:
--------
---
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes
2020-03-27 21:56:11.998754450 +0100
+++
/work/SRC/openSUSE:Factory/.transactional-update.new.3160/transactional-update.changes
2020-03-30 22:51:45.303784531 +0200
@@ -1,0 +2,6 @@
+Mon Mar 30 12:09:34 UTC 2020 - Ignaz Forster <[email protected]>
+
+- Update to version 2.21
+ - Use slave mounts for /proc, /sys & /dev
+
+-------------------------------------------------------------------
Old:
----
transactional-update-2.20.4.tar.gz
New:
----
transactional-update-2.21.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.CEv5YI/_old 2020-03-30 22:51:46.139784987 +0200
+++ /var/tmp/diff_new_pack.CEv5YI/_new 2020-03-30 22:51:46.163785000 +0200
@@ -17,7 +17,7 @@
Name: transactional-update
-Version: 2.20.4
+Version: 2.21
Release: 0
Summary: Transactional Updates with btrfs and snapshots
License: GPL-2.0-or-later
++++++ transactional-update-2.20.4.tar.gz -> transactional-update-2.21.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.20.4/NEWS
new/transactional-update-2.21/NEWS
--- old/transactional-update-2.20.4/NEWS 2020-03-26 09:18:09.000000000
+0100
+++ new/transactional-update-2.21/NEWS 2020-03-30 14:05:53.000000000 +0200
@@ -2,6 +2,10 @@
Copyright (C) 2016-2019 Thorsten Kukuk et al.
+Version 2.21
+* Use slave mounts for /proc, /sys & /dev - this will also provide all
+ submounts into the update environment
+
Version 2.20.4
* Mount efivarfs on EFI systems to make sure the bootloader will be installed
correctly.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.20.4/configure.ac
new/transactional-update-2.21/configure.ac
--- old/transactional-update-2.20.4/configure.ac 2020-03-26
09:18:09.000000000 +0100
+++ new/transactional-update-2.21/configure.ac 2020-03-30 14:05:53.000000000
+0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 2.20.4)
+AC_INIT(transactional-update, 2.21)
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.4/sbin/transactional-update.in
new/transactional-update-2.21/sbin/transactional-update.in
--- old/transactional-update-2.20.4/sbin/transactional-update.in
2020-03-26 09:18:09.000000000 +0100
+++ new/transactional-update-2.21/sbin/transactional-update.in 2020-03-30
14:05:53.000000000 +0200
@@ -21,7 +21,7 @@
export LANG=C
export DISABLE_SNAPPER_ZYPP_PLUGIN=1
-DIR_TO_MOUNT="dev opt var/log"
+DIR_TO_MOUNT="opt var/log"
EXITCODE=0
VERBOSITY=2
ZYPPER_ARG=""
@@ -307,7 +307,7 @@
fi
# Unmount everything we don't need anymore:
- for directory in proc sys etc $DIR_TO_MOUNT .snapshots ; do
+ for directory in etc $DIR_TO_MOUNT .snapshots dev sys proc; do
# Only try unmount if directory is mounted
if ! findmnt ${SNAPSHOT_DIR}/$directory >/dev/null; then
continue;
@@ -1078,17 +1078,14 @@
DIR_TO_MOUNT="${DIR_TO_MOUNT} /boot/writable"
fi
- # Mount everything we need:
- mount -t proc none ${SNAPSHOT_DIR}/proc
- if [ $? -ne 0 ]; then
- log_error "ERROR: mount of proc failed!"
- quit 1
- fi
- mount -t sysfs sys ${SNAPSHOT_DIR}/sys
- if [ $? -ne 0 ]; then
- log_error "ERROR: mount of sys failed!"
- quit 1
- fi
+ # Bind system directories into chroot environment
+ for sysdir in /proc /sys /dev; do
+ if ! mount --rbind "${sysdir}" "${SNAPSHOT_DIR}${sysdir}" ||
+ ! mount --make-rslave "${SNAPSHOT_DIR}${sysdir}"; then
+ log_error "ERROR: mounting ${sysdir} failed!"
+ quit 1
+ fi
+ done
# Check which directories in /boot/grub2 need to be mounted,
# otherwise grub2 will not boot after a version update.
@@ -1096,13 +1093,6 @@
# 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
@@ -1123,16 +1113,7 @@
quit 1;
fi
fi
- if [ -x /usr/sbin/selinuxenabled ]; then
- /usr/sbin/selinuxenabled
- if [ $? -eq 0 ]; then
- mount -t selinuxfs selinux ${SNAPSHOT_DIR}/sys/fs/selinux
- if [ $? -ne 0 ]; then
- log_error "ERROR: mount of sys failed!"
- quit 1
- fi
- fi
- fi
+
for directory in $DIR_TO_MOUNT ; do
# Make sure mount point exists. With /var on an own subvolume, this
directory
# is empty by default and mount points don't exist in chroot
environment.
