Hello community,
here is the log from the commit of package transactional-update for
openSUSE:Factory checked in at 2020-08-13 10:15:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
and /work/SRC/openSUSE:Factory/.transactional-update.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transactional-update"
Thu Aug 13 10:15:02 2020 rev:58 rq:825971 version:2.24.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes
2020-08-05 20:25:56.595017046 +0200
+++
/work/SRC/openSUSE:Factory/.transactional-update.new.3399/transactional-update.changes
2020-08-13 10:17:08.574732028 +0200
@@ -1,0 +2,12 @@
+Wed Aug 12 10:06:11 UTC 2020 - Ignaz Forster <ifors...@suse.com>
+
+- Version 2.24.1
+ - SELinux: adjust labels for etc, fstab and grub.cfg
+
+-------------------------------------------------------------------
+Thu Aug 6 08:32:11 UTC 2020 - Ignaz Forster <ifors...@suse.com>
+
+- Version 2.24
+ - Add partial SELinux support
+
+-------------------------------------------------------------------
Old:
----
transactional-update-2.23.tar.gz
New:
----
transactional-update-2.24.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.pNQHo1/_old 2020-08-13 10:17:09.622732459 +0200
+++ /var/tmp/diff_new_pack.pNQHo1/_new 2020-08-13 10:17:09.626732460 +0200
@@ -17,7 +17,7 @@
Name: transactional-update
-Version: 2.23
+Version: 2.24.1
Release: 0
Summary: Transactional Updates with btrfs and snapshots
License: GPL-2.0-or-later
++++++ transactional-update-2.23.tar.gz -> transactional-update-2.24.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.23/NEWS
new/transactional-update-2.24.1/NEWS
--- old/transactional-update-2.23/NEWS 2020-07-31 18:08:35.000000000 +0200
+++ new/transactional-update-2.24.1/NEWS 2020-08-12 12:04:41.000000000
+0200
@@ -2,6 +2,12 @@
Copyright (C) 2016-2019 Thorsten Kukuk et al.
+Version 2.24.1
+* SELinux: adjust labels for etc, fstab and grub.cfg
+
+Version 2.24
+* Add partial SELinux support
+
Version 2.23
* Add "run" command to be able to execute a single command in a new snapshot
* Add "--drop-if-no-change" option to discard snapshots if no changes were
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.23/configure.ac
new/transactional-update-2.24.1/configure.ac
--- old/transactional-update-2.23/configure.ac 2020-07-31 18:08:35.000000000
+0200
+++ new/transactional-update-2.24.1/configure.ac 2020-08-12
12:04:41.000000000 +0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 2.23)
+AC_INIT(transactional-update, 2.24.1)
AM_INIT_AUTOMAKE
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-2.23/dracut/module-setup.sh
new/transactional-update-2.24.1/dracut/module-setup.sh
--- old/transactional-update-2.23/dracut/module-setup.sh 2020-07-31
18:08:35.000000000 +0200
+++ new/transactional-update-2.24.1/dracut/module-setup.sh 2020-08-12
12:04:41.000000000 +0200
@@ -6,5 +6,5 @@
inst_simple "$moddir/transactional-update-etc-cleaner.service"
$systemdsystemunitdir/transactional-update-etc-cleaner.service
mkdir -p "${initdir}/$systemdsystemunitdir/initrd.target.wants"
ln_r "$systemdsystemunitdir/transactional-update-etc-cleaner.service"
"$systemdsystemunitdir/initrd.target.wants/transactional-update-etc-cleaner.service"
- inst_multiple stat rmdir getfattr
+ inst_multiple stat rmdir
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-2.23/sbin/transactional-update.in
new/transactional-update-2.24.1/sbin/transactional-update.in
--- old/transactional-update-2.23/sbin/transactional-update.in 2020-07-31
18:08:35.000000000 +0200
+++ new/transactional-update-2.24.1/sbin/transactional-update.in
2020-08-12 12:04:41.000000000 +0200
@@ -3,7 +3,7 @@
# transactional-update - apply updates to the system in an atomic way
#
# Author: Thorsten Kukuk <ku...@suse.com>
-# Copyright (C) 2016, 2017, 2018, 2019 SUSE Linux GmbH
+# Copyright (C) 2016, 2017, 2018, 2019, 2020 SUSE Linux GmbH
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -60,6 +60,8 @@
DROP_IF_NO_CHANGE=0
INOTIFY_EXCLUDES=""
+TMPDIR=${TMPDIR:-/tmp}
+
# Load config
if [ -r ${SYSTEMCONFFILE} ]; then
. ${SYSTEMCONFFILE}
@@ -98,7 +100,7 @@
log_info "Checking for newer version."
if zypper --non-interactive info transactional-update | grep -q '^Status
*: out-of-date'; then
log_info "New version found - updating..."
- TA_UPDATE_TMPFILE="`mktemp -d /tmp/transactional-update.XXXXXXXXXX`"
+ TA_UPDATE_TMPFILE="`mktemp -d
${TMPDIR}/transactional-update.XXXXXXXXXX`"
if [ $? -ne 0 ]; then
log_error "ERROR: Couldn't create temporary directory for
self-update."
quit 1
@@ -779,9 +781,11 @@
if [ $? -eq 0 ]; then
log_info "Separate /var detected."
DIR_TO_MOUNT="${DIR_TO_MOUNT} var/cache"
- if [ -d /var/lib/alternatives ]; then
- DIR_TO_MOUNT="${DIR_TO_MOUNT} var/lib/alternatives"
- fi
+ for vardir in /var/lib/alternatives /var/lib/selinux ; do
+ if [ -d "${vardir}" ]; then
+ DIR_TO_MOUNT="${DIR_TO_MOUNT} ${vardir}"
+ fi
+ done
HAS_SEPARATE_VAR=1
else
grep -q var.cache /proc/mounts
@@ -1190,7 +1194,7 @@
RETVAL=${PIPESTATUS[0]}
else
# Check if there are updates at all.
- TMPFILE=`mktemp /tmp/transactional-update.XXXXXXXXXX`
+ TMPFILE=`mktemp ${TMPDIR}/transactional-update.XXXXXXXXXX`
zypper -R ${MOUNT_DIR} --xmlout ${ZYPPER_ARG} -y
--auto-agree-with-product-licenses --dry-run "${ZYPPER_ARG_PKGS[@]}" >
${TMPFILE}
PACKAGE_UPDATES=`grep "install-summary download-size" ${TMPFILE} |
sed -e 's|.*install-summary download-size=\"\(.*\)\" space-usage-diff.*|\1|g'`
SIZE_OF_UPDATES=`grep "install-summary.*space-usage-diff"
${TMPFILE} | sed -e
's|.*install-summary.*space-usage-diff=\"\([^"]*\)\".*|\1|g'`
@@ -1264,6 +1268,10 @@
if [ $? -ne 0 ]; then
log_error "ERROR: grub2-mkconfig failed!"
EXITCODE=1;
+ else
+ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled ;
then
+ chcon --reference /boot/grub2/grub.cfg
"${MOUNT_DIR}/boot/grub2/grub.cfg"
+ fi
fi
fi
@@ -1285,6 +1293,11 @@
env PS1="transactional update # " chroot ${MOUNT_DIR} bash 2>&4
fi
+ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled ; then
+ chcon --reference /etc "${ETC_OVERLAY_DIR}"
+ chcon --reference /etc/fstab "${MOUNT_DIR}/etc/fstab"
+ fi
+
teardown
# Somersault:
