Hello community,
here is the log from the commit of package transactional-update for
openSUSE:Factory checked in at 2018-03-13 10:24:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/transactional-update (Old)
and /work/SRC/openSUSE:Factory/.transactional-update.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transactional-update"
Tue Mar 13 10:24:07 2018 rev:22 rq:585864 version:1.28
Changes:
--------
---
/work/SRC/openSUSE:Factory/transactional-update/transactional-update.changes
2018-03-07 10:38:21.954496155 +0100
+++
/work/SRC/openSUSE:Factory/.transactional-update.new/transactional-update.changes
2018-03-13 10:24:14.277341732 +0100
@@ -1,0 +2,6 @@
+Mon Mar 12 13:19:49 CET 2018 - ku...@suse.de
+
+- Update to version 1.28
+ - Adjust for latest grub2
+
+-------------------------------------------------------------------
Old:
----
transactional-update-1.27.tar.bz2
New:
----
transactional-update-1.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ transactional-update.spec ++++++
--- /var/tmp/diff_new_pack.X12PXz/_old 2018-03-13 10:24:14.925318516 +0100
+++ /var/tmp/diff_new_pack.X12PXz/_new 2018-03-13 10:24:14.929318373 +0100
@@ -17,7 +17,7 @@
Name: transactional-update
-Version: 1.27
+Version: 1.28
Release: 0
Summary: Transactional Updates with btrfs and snapshots
License: GPL-2.0-or-later
@@ -46,9 +46,6 @@
%install
%make_install
-# In /etc is for admins to overwrite /usr/etc, so don't
-# install it there.
-rm %{buildroot}%{_sysconfdir}/transactional-update.conf
%fdupes %{buildroot}%{_mandir}
%pre
++++++ transactional-update-1.27.tar.bz2 -> transactional-update-1.28.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/NEWS
new/transactional-update-1.28/NEWS
--- old/transactional-update-1.27/NEWS 2018-03-06 13:26:01.000000000 +0100
+++ new/transactional-update-1.28/NEWS 2018-03-12 13:17:29.000000000 +0100
@@ -2,6 +2,9 @@
Copyright (C) 2016, 2017, 2018 Thorsten Kukuk
+Version 1.28
+* Adjust for latest grub2 changes
+
Version 1.27
* Fallback to snapper without dbus support if dbus fails
* Add workaround for update-alternatives
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/configure
new/transactional-update-1.28/configure
--- old/transactional-update-1.27/configure 2018-03-06 13:26:08.000000000
+0100
+++ new/transactional-update-1.28/configure 2018-03-12 13:17:32.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for transactional-update 1.27.
+# Generated by GNU Autoconf 2.69 for transactional-update 1.28.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@
# Identity of this package.
PACKAGE_NAME='transactional-update'
PACKAGE_TARNAME='transactional-update'
-PACKAGE_VERSION='1.27'
-PACKAGE_STRING='transactional-update 1.27'
+PACKAGE_VERSION='1.28'
+PACKAGE_STRING='transactional-update 1.28'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1212,7 +1212,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures transactional-update 1.27 to adapt to many kinds of
systems.
+\`configure' configures transactional-update 1.28 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1279,7 +1279,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of transactional-update 1.27:";;
+ short | recursive ) echo "Configuration of transactional-update 1.28:";;
esac
cat <<\_ACEOF
@@ -1359,7 +1359,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-transactional-update configure 1.27
+transactional-update configure 1.28
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1376,7 +1376,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by transactional-update $as_me 1.27, which was
+It was created by transactional-update $as_me 1.28, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2239,7 +2239,7 @@
# Define the identity of the package.
PACKAGE='transactional-update'
- VERSION='1.27'
+ VERSION='1.28'
cat >>confdefs.h <<_ACEOF
@@ -3186,7 +3186,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by transactional-update $as_me 1.27, which was
+This file was extended by transactional-update $as_me 1.28, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3239,7 +3239,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-transactional-update config.status 1.27
+transactional-update config.status 1.28
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/configure.ac
new/transactional-update-1.28/configure.ac
--- old/transactional-update-1.27/configure.ac 2018-03-06 12:58:14.000000000
+0100
+++ new/transactional-update-1.28/configure.ac 2018-03-12 13:17:10.000000000
+0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(transactional-update, 1.27)
+AC_INIT(transactional-update, 1.28)
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-1.27/doc/Makefile.in
new/transactional-update-1.28/doc/Makefile.in
--- old/transactional-update-1.27/doc/Makefile.in 2018-03-06
13:26:08.000000000 +0100
+++ new/transactional-update-1.28/doc/Makefile.in 2018-03-12
13:17:32.000000000 +0100
@@ -211,9 +211,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
+ $(AUTOMAKE) --foreign doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/etc/Makefile.am
new/transactional-update-1.28/etc/Makefile.am
--- old/transactional-update-1.27/etc/Makefile.am 2018-03-05
16:44:00.000000000 +0100
+++ new/transactional-update-1.28/etc/Makefile.am 2018-03-12
13:17:01.000000000 +0100
@@ -2,10 +2,11 @@
# Copyright (c) 2018 Ignaz Forster <ifors...@suse.com>
#
-sysconf_DATA = transactional-update.conf
-
-EXTRA_DIST = $(DATA)
+EXTRA_DIST = transactional-update.conf
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(prefix)/etc
- $(INSTALL_DATA) $(srcdir)/$(DATA) $(DESTDIR)$(prefix)/etc
+ $(mkinstalldirs) $(DESTDIR)$(prefix)$(sysconfdir)
+ $(INSTALL_DATA) $(srcdir)/$(EXTRA_DIST) $(DESTDIR)$(prefix)$(sysconfdir)
+
+uninstall-local:
+ -rm $(DESTDIR)$(prefix)$(sysconfdir)/$(EXTRA_DIST)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/etc/Makefile.in
new/transactional-update-1.28/etc/Makefile.in
--- old/transactional-update-1.27/etc/Makefile.in 2018-03-06
13:26:08.000000000 +0100
+++ new/transactional-update-1.28/etc/Makefile.in 2018-03-12
13:17:32.000000000 +0100
@@ -17,7 +17,6 @@
#
# Copyright (c) 2018 Ignaz Forster <ifors...@suse.com>
#
-
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -109,35 +108,6 @@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(sysconfdir)"
-DATA = $(sysconf_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -224,8 +194,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-sysconf_DATA = transactional-update.conf
-EXTRA_DIST = $(DATA)
+EXTRA_DIST = transactional-update.conf
all: all-am
.SUFFIXES:
@@ -238,9 +207,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu etc/Makefile
+ $(AUTOMAKE) --foreign etc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -259,27 +228,6 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
- done
-
-uninstall-sysconfDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
tags TAGS:
ctags CTAGS:
@@ -319,11 +267,8 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile
installdirs:
- for dir in "$(DESTDIR)$(sysconfdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -380,7 +325,7 @@
install-dvi-am:
-install-exec-am: install-sysconfDATA
+install-exec-am:
install-html: install-html-am
@@ -418,7 +363,7 @@
ps-am:
-uninstall-am: uninstall-sysconfDATA
+uninstall-am: uninstall-local
.MAKE: install-am install-strip
@@ -429,15 +374,17 @@
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
- install-sysconfDATA installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
- uninstall-am uninstall-sysconfDATA
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-local
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(prefix)/etc
- $(INSTALL_DATA) $(srcdir)/$(DATA) $(DESTDIR)$(prefix)/etc
+ $(mkinstalldirs) $(DESTDIR)$(prefix)$(sysconfdir)
+ $(INSTALL_DATA) $(srcdir)/$(EXTRA_DIST) $(DESTDIR)$(prefix)$(sysconfdir)
+
+uninstall-local:
+ -rm $(DESTDIR)$(prefix)$(sysconfdir)/$(EXTRA_DIST)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/logrotate/Makefile.in
new/transactional-update-1.28/logrotate/Makefile.in
--- old/transactional-update-1.27/logrotate/Makefile.in 2018-03-06
13:26:08.000000000 +0100
+++ new/transactional-update-1.28/logrotate/Makefile.in 2018-03-12
13:17:32.000000000 +0100
@@ -239,9 +239,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu logrotate/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign logrotate/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu logrotate/Makefile
+ $(AUTOMAKE) --foreign logrotate/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/man/Makefile.in
new/transactional-update-1.28/man/Makefile.in
--- old/transactional-update-1.27/man/Makefile.in 2018-03-06
13:26:08.000000000 +0100
+++ new/transactional-update-1.28/man/Makefile.in 2018-03-12
13:17:32.000000000 +0100
@@ -273,9 +273,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu man/Makefile
+ $(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-1.27/man/transactional-update.conf.5
new/transactional-update-1.28/man/transactional-update.conf.5
--- old/transactional-update-1.27/man/transactional-update.conf.5
2018-03-06 13:27:29.000000000 +0100
+++ new/transactional-update-1.28/man/transactional-update.conf.5
2018-03-12 13:17:34.000000000 +0100
@@ -2,12 +2,12 @@
.\" Title: transactional-update.conf
.\" Author: Ignaz Forster <ifors...@suse.com>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 03/06/2018
+.\" Date: 03/12/2018
.\" Manual: transactional-update.conf
.\" Source: transactional-update
.\" Language: English
.\"
-.TH "TRANSACTIONAL\-UPDAT" "5" "03/06/2018" "transactional-update"
"transactional-update.conf"
+.TH "TRANSACTIONAL\-UPDAT" "5" "03/12/2018" "transactional-update"
"transactional-update.conf"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -43,7 +43,7 @@
PARAMETER=value\&.
.PP
A reference file (also used for reading the default values) can be found in
-/usr/etc/transactional\-update\&.conf\&.
+/usr/usr/etc/transactional\-update\&.conf\&.
.SH "OPTIONS"
.PP
The following options are available in the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-1.27/man/transactional-update.conf.5.html
new/transactional-update-1.28/man/transactional-update.conf.5.html
--- old/transactional-update-1.27/man/transactional-update.conf.5.html
2018-03-06 13:27:29.000000000 +0100
+++ new/transactional-update-1.28/man/transactional-update.conf.5.html
2018-03-12 13:17:34.000000000 +0100
@@ -15,11 +15,11 @@
h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink,
dt:hover > a.headerlink {
visibility: visible;
}
- </style><a xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.index.html">Index </a><span
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common"; style="float:right">transactional-update
1.27</span><hr xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";><div class="refentry"><a
name="transactional-update.conf.5"></a><div class="titlepage"></div><div
class="refnamediv"><h2>Name</h2><p>transactional-update.conf —
transactional-update configuration file</p></div><div
class="refsynopsisdiv"><h2>Synopsis</h2><p>/usr/etc/transactional-update.conf</p></div><div
class="refsect1"><a name="id-1.5"></a><h2 id="Description">Description<a
class="headerlink" title="Permalink to this headline"
href="#Description">¶</a></h2><p>This configuration file controls and defines
the behaviour of
+ </style><a xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.index.html">Index </a><span
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common"; style="float:right">transactional-update
1.28</span><hr xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";><div class="refentry"><a
name="transactional-update.conf.5"></a><div class="titlepage"></div><div
class="refnamediv"><h2>Name</h2><p>transactional-update.conf —
transactional-update configuration file</p></div><div
class="refsynopsisdiv"><h2>Synopsis</h2><p>/usr/etc/transactional-update.conf</p></div><div
class="refsect1"><a name="id-1.5"></a><h2 id="Description">Description<a
class="headerlink" title="Permalink to this headline"
href="#Description">¶</a></h2><p>This configuration file controls and defines
the behaviour of
<a xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common"; href="transactional-update.8.html"><span
class="citerefentry"><span
class="refentrytitle">transactional-update</span>(8)</span></a>.</p><p>The
transactional-update.conf file uses shell
style assignments, e.g. <code class="code">PARAMETER=value</code>.</p><p>A
reference file (also used for reading the default values) can be
found in
- /usr/etc/transactional-update.conf.</p></div><div class="refsect1"><a
name="id-1.6"></a><h2 id="Options">Options<a class="headerlink"
title="Permalink to this headline" href="#Options">¶</a></h2><p>The following
options are available in the
+ /usr/usr/etc/transactional-update.conf.</p></div><div class="refsect1"><a
name="id-1.6"></a><h2 id="Options">Options<a class="headerlink"
title="Permalink to this headline" href="#Options">¶</a></h2><p>The following
options are available in the
"<code class="literal">transactional-update</code>" section:
</p><div class="variablelist"><dl class="variablelist"><dt
id="REBOOT_METHOD"><span class="term"><code
class="varname">REBOOT_METHOD</code></span><a class="headerlink"
title="Permalink to this term" href="#REBOOT_METHOD">¶</a></dt><dd
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";><p>Specify the reboot method to
use.</p><div class="variablelist"><dl class="variablelist"><dt id="auto"><span
class="term">"<code class="literal">auto</code>"</span><a class="headerlink"
title="Permalink to this term" href="#auto">¶</a></dt><dd><p>
Uses "<code class="literal">rebootmgr</code>" if available
and active;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-1.27/man/transactional-update.conf.5.xml
new/transactional-update-1.28/man/transactional-update.conf.5.xml
--- old/transactional-update-1.27/man/transactional-update.conf.5.xml
2018-03-05 16:44:00.000000000 +0100
+++ new/transactional-update-1.28/man/transactional-update.conf.5.xml
2018-03-12 13:17:01.000000000 +0100
@@ -61,7 +61,7 @@
style assignments, e.g. <code>PARAMETER=value</code>.</para>
<para>A reference file (also used for reading the default values) can be
found in
- <filename>%prefix%/etc/transactional-update.conf</filename>.</para>
+ <filename>%prefix%%sysconfdir%/transactional-update.conf</filename>.</para>
</refsect1>
<refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-1.27/man/transactional-update.index.html
new/transactional-update-1.28/man/transactional-update.index.html
--- old/transactional-update-1.27/man/transactional-update.index.html
2018-03-06 13:27:29.000000000 +0100
+++ new/transactional-update-1.28/man/transactional-update.index.html
2018-03-12 13:17:34.000000000 +0100
@@ -15,4 +15,4 @@
h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink,
dt:hover > a.headerlink {
visibility: visible;
}
- </style><a xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.index.html">Index </a><span
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common"; style="float:right">transactional-update
1.27</span><hr xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";><div class="refentry"><a
name="transactional-update.index"></a><div class="titlepage"></div><div
class="refnamediv"><h2>Name</h2><p>transactional-update.index — List all
manpages from the transactional-update project</p></div><div
class="refsect1"><a name="id-1.4"></a><h2 id="T">T<a class="headerlink"
title="Permalink to this headline" href="#T">¶</a></h2><p><a
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common"; href="transactional-update.8.html"><span
class="citerefentry"><span
class="refentrytitle">transactional-update</span>(8)</span></a> -- Apply
updates to the system in an atomic way via transactional updates.<br><a
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.conf.5.html"><span class="citerefentry"><span
class="refentrytitle">transactional-update.conf</span>(5)</span></a> --
transactional-update configuration file<br><a
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.service.8.html"><span class="citerefentry"><span
class="refentrytitle">transactional-update.service</span>(8)</span></a> --
Apply updates to the system in an atomic way via transactional updates.<br><a
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.timer.8.html"><span class="citerefentry"><span
class="refentrytitle">transactional-update.timer</span>(8)</span></a> -- Apply
updates to the system in an atomic way via transactional
updates.<br></p></div><div class="refsect1"><a name="id-1.5"></a><p><a
name="counts"></a>This index contains 4 entries, referring to 2 individual
manual pages.</p></div></div></body></html>
+ </style><a xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.index.html">Index </a><span
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common"; style="float:right">transactional-update
1.28</span><hr xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";><div class="refentry"><a
name="transactional-update.index"></a><div class="titlepage"></div><div
class="refnamediv"><h2>Name</h2><p>transactional-update.index — List all
manpages from the transactional-update project</p></div><div
class="refsect1"><a name="id-1.4"></a><h2 id="T">T<a class="headerlink"
title="Permalink to this headline" href="#T">¶</a></h2><p><a
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common"; href="transactional-update.8.html"><span
class="citerefentry"><span
class="refentrytitle">transactional-update</span>(8)</span></a> -- Apply
updates to the system in an atomic way via transactional updates.<br><a
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.conf.5.html"><span class="citerefentry"><span
class="refentrytitle">transactional-update.conf</span>(5)</span></a> --
transactional-update configuration file<br><a
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.service.8.html"><span class="citerefentry"><span
class="refentrytitle">transactional-update.service</span>(8)</span></a> --
Apply updates to the system in an atomic way via transactional updates.<br><a
xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0";
xmlns:exsl="http://exslt.org/common";
href="transactional-update.timer.8.html"><span class="citerefentry"><span
class="refentrytitle">transactional-update.timer</span>(8)</span></a> -- Apply
updates to the system in an atomic way via transactional
updates.<br></p></div><div class="refsect1"><a name="id-1.5"></a><p><a
name="counts"></a>This index contains 4 entries, referring to 2 individual
manual pages.</p></div></div></body></html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/sbin/Makefile.in
new/transactional-update-1.28/sbin/Makefile.in
--- old/transactional-update-1.27/sbin/Makefile.in 2018-03-06
13:26:08.000000000 +0100
+++ new/transactional-update-1.28/sbin/Makefile.in 2018-03-12
13:17:32.000000000 +0100
@@ -244,9 +244,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sbin/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign sbin/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu sbin/Makefile
+ $(AUTOMAKE) --foreign sbin/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/transactional-update-1.27/sbin/transactional-update.in
new/transactional-update-1.28/sbin/transactional-update.in
--- old/transactional-update-1.27/sbin/transactional-update.in 2018-03-05
17:09:20.000000000 +0100
+++ new/transactional-update-1.28/sbin/transactional-update.in 2018-03-12
13:17:01.000000000 +0100
@@ -38,7 +38,7 @@
RUN_SHELL=0
USE_SALT_GRAINS=0
CONFFILE="@sysconfdir@/transactional-update.conf"
-SYSTEMCONFFILE="@prefix@/etc/transactional-update.conf"
+SYSTEMCONFFILE="@prefix@@sysconfdir@/transactional-update.conf"
LOGFILE="/var/log/transactional-update.log"
STATE_FILE="/var/lib/misc/transactional-update.state"
PACKAGE_UPDATES=0
@@ -251,6 +251,26 @@
LAST_WORKING_SNAPSHOTS="${NEW_ID} ${LAST_WORKING_SNAPSHOTS}"
}
+check_registration_on_next_reboot() {
+ if [ ${HAS_SEPARATE_VAR} -eq 0 ]; then
+ # /var own subvolume, not mounted during update, so touch the
+ # file in the running system.
+ test -d /var/lib/rollback || mkdir -p /var/lib/rollback
+ touch /var/lib/rollback/check-registration
+ else
+ # check if /var/lib/rollback is own subvolume
+ grep -q "[[:space:]]/var/lib/rollback[[:space:]]" /proc/mounts
+ if [ $? -eq 0 ]; then
+ # Extra subvolume, not mounted in chroot, touch outside.
+ touch /var/lib/rollback/check-registration
+ else
+ # no subvolumes,
+ test -d ${MOUNT_DIR}/var/lib/rollback || mkdir -p
${MOUNT_DIR}/var/lib/rollback
+ touch ${MOUNT_DIR}/var/lib/rollback/check-registration
+ fi
+ fi
+}
+
ORIG_ARGS="$@"
# If no option is given, assume "up"
@@ -447,8 +467,7 @@
fi
# Create the trigger to re-register the system as new version after
next
# reboot.
- test -d ${MOUNT_DIR}/var/lib/rollback || mkdir -p
${MOUNT_DIR}/var/lib/rollback
- touch ${MOUNT_DIR}/var/lib/rollback/check-registration
+ check_registration_on_next_reboot
fi
# Remove possible cleanup algo
snapper ${SNAPPER_NO_DBUS} modify -c '' ${ROLLBACK_SNAPSHOT}
@@ -691,6 +710,7 @@
# Create bind mount or else grub2 will fail
MOUNT_DIR=`mktemp -d`
mount -o rbind ${SNAPSHOT_DIR} ${MOUNT_DIR}
+ mount -o bind,ro /.snapshots ${MOUNT_DIR}/.snapshots
# Set indicator for RPM pre/post sections to detect whether we run in a
# transactional update
@@ -721,8 +741,7 @@
if [ $RETVAL -eq 0 ]; then
# Create the trigger to re-register the system as new
version after next
# reboot.
- test -d ${MOUNT_DIR}/var/lib/rollback || mkdir -p
${MOUNT_DIR}/var/lib/rollback
- touch ${MOUNT_DIR}/var/lib/rollback/check-registration
+ check_registration_on_next_reboot
fi
else
env DISABLE_RESTART_ON_UPDATE=yes zypper -R ${MOUNT_DIR}
${ZYPPER_ARG} ${ZYPPER_ARG_PKGS}
@@ -736,6 +755,12 @@
else
copy_user_group_accounts
REBUILD_KDUMP_INITRD=1
+ # check if products are updated and we need to re-register
+ # at next boot.
+ diff -qr /etc/products.d ${MOUNT_DIR}/etc/products.d > /dev/null
+ if [ $? -ne 0 ]; then
+ check_registration_on_next_reboot
+ fi
fi
fi
@@ -787,7 +812,7 @@
fi
# Unmount everything we don't need anymore:
- for directory in proc sys $DIR_TO_MOUNT ; do
+ for directory in proc sys $DIR_TO_MOUNT .snapshots ; do
umount -R ${SNAPSHOT_DIR}/$directory
if [ $? -ne 0 ]; then
log_error "ERROR: umount of $directory failed!"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/transactional-update-1.27/systemd/Makefile.in
new/transactional-update-1.28/systemd/Makefile.in
--- old/transactional-update-1.27/systemd/Makefile.in 2018-03-06
13:26:08.000000000 +0100
+++ new/transactional-update-1.28/systemd/Makefile.in 2018-03-12
13:17:32.000000000 +0100
@@ -239,9 +239,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemd/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign systemd/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu systemd/Makefile
+ $(AUTOMAKE) --foreign systemd/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
