Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package os-update for openSUSE:Factory
checked in at 2022-12-19 15:02:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-update (Old)
and /work/SRC/openSUSE:Factory/.os-update.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-update"
Mon Dec 19 15:02:43 2022 rev:9 rq:1043761 version:1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-update/os-update.changes 2022-12-05
18:02:34.565030815 +0100
+++ /work/SRC/openSUSE:Factory/.os-update.new.1835/os-update.changes
2022-12-19 15:02:43.435783094 +0100
@@ -1,0 +2,7 @@
+Mon Dec 19 12:23:37 UTC 2022 - Thorsten Kukuk <ku...@suse.com>
+
+- Update to Version 1.7
+ - Fix detection of running rebootmgrd
+ - Add SERVICES_TRIGGERING_REBOOT (#2)
+
+-------------------------------------------------------------------
@@ -5 +12 @@
- - restart systemd if necessary
+ - Restart systemd if necessary
Old:
----
os-update-1.6.tar.xz
New:
----
os-update-1.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-update.spec ++++++
--- /var/tmp/diff_new_pack.2HCJzh/_old 2022-12-19 15:02:43.975786144 +0100
+++ /var/tmp/diff_new_pack.2HCJzh/_new 2022-12-19 15:02:43.979786167 +0100
@@ -21,7 +21,7 @@
%endif
Name: os-update
-Version: 1.6
+Version: 1.7
Release: 0
Summary: Updates the system regular to stay current and safe
License: GPL-2.0-or-later
++++++ os-update-1.6.tar.xz -> os-update-1.7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.6/NEWS new/os-update-1.7/NEWS
--- old/os-update-1.6/NEWS 2022-12-05 14:44:35.000000000 +0100
+++ new/os-update-1.7/NEWS 2022-12-19 13:16:00.000000000 +0100
@@ -1,5 +1,9 @@
+Version 1.7
+ - Fix detection of running rebootmgrd
+ - Add SERVICES_TRIGGERING_REBOOT (#2)
+
Version 1.6
- - restart systemd if necessary
+ - Restart systemd if necessary
Version 1.5
- Restart udev after update by default
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.6/configure new/os-update-1.7/configure
--- old/os-update-1.6/configure 2022-12-05 14:44:58.000000000 +0100
+++ new/os-update-1.7/configure 2022-12-19 13:16:04.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for os-update 1.6.
+# Generated by GNU Autoconf 2.69 for os-update 1.7.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@
# Identity of this package.
PACKAGE_NAME='os-update'
PACKAGE_TARNAME='os-update'
-PACKAGE_VERSION='1.6'
-PACKAGE_STRING='os-update 1.6'
+PACKAGE_VERSION='1.7'
+PACKAGE_STRING='os-update 1.7'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1214,7 +1214,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 os-update 1.6 to adapt to many kinds of systems.
+\`configure' configures os-update 1.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1280,7 +1280,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of os-update 1.6:";;
+ short | recursive ) echo "Configuration of os-update 1.7:";;
esac
cat <<\_ACEOF
@@ -1370,7 +1370,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-os-update configure 1.6
+os-update configure 1.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1387,7 +1387,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by os-update $as_me 1.6, which was
+It was created by os-update $as_me 1.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2250,7 +2250,7 @@
# Define the identity of the package.
PACKAGE='os-update'
- VERSION='1.6'
+ VERSION='1.7'
cat >>confdefs.h <<_ACEOF
@@ -3124,7 +3124,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by os-update $as_me 1.6, which was
+This file was extended by os-update $as_me 1.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3177,7 +3177,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-os-update config.status 1.6
+os-update config.status 1.7
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/os-update-1.6/configure.ac
new/os-update-1.7/configure.ac
--- old/os-update-1.6/configure.ac 2022-12-05 14:44:48.000000000 +0100
+++ new/os-update-1.7/configure.ac 2022-12-19 13:14:50.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(os-update, 1.6)
+AC_INIT(os-update, 1.7)
AM_INIT_AUTOMAKE
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.6/src/Makefile.in
new/os-update-1.7/src/Makefile.in
--- old/os-update-1.6/src/Makefile.in 2022-12-05 14:44:59.000000000 +0100
+++ new/os-update-1.7/src/Makefile.in 2022-12-19 13:16:03.000000000 +0100
@@ -253,9 +253,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
+ $(AUTOMAKE) --foreign src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.6/src/os-update.8
new/os-update-1.7/src/os-update.8
--- old/os-update-1.6/src/os-update.8 2022-11-22 14:56:17.000000000 +0100
+++ new/os-update-1.7/src/os-update.8 2022-12-19 13:16:05.000000000 +0100
@@ -57,6 +57,9 @@
.TP
IGNORE_SERVICES_FROM_RESTART=\[lq]dbus\[rq]
Specifies a list of services which should not be restarted
+.TP
+SERVICES_TRIGGERING_REBOOT=\[lq]dbus\[rq]
+Specifies a list of services which trigger a reboot
.SH CONFIGURATION FILES
.TP
/usr/etc/os-update.conf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.6/src/os-update.8.md
new/os-update-1.7/src/os-update.8.md
--- old/os-update-1.6/src/os-update.8.md 2022-11-22 14:56:13.000000000
+0100
+++ new/os-update-1.7/src/os-update.8.md 2022-12-19 13:14:11.000000000
+0100
@@ -46,6 +46,9 @@
IGNORE_SERVICES_FROM_RESTART="dbus"
: Specifies a list of services which should not be restarted
+SERVICES_TRIGGERING_REBOOT="dbus"
+: Specifies a list of services which trigger a reboot
+
# CONFIGURATION FILES
/usr/etc/os-update.conf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.6/src/os-update.conf
new/os-update-1.7/src/os-update.conf
--- old/os-update-1.6/src/os-update.conf 2022-11-22 14:56:01.000000000
+0100
+++ new/os-update-1.7/src/os-update.conf 2022-12-19 13:14:11.000000000
+0100
@@ -2,3 +2,4 @@
REBOOT_CMD=auto
RESTART_SERVICES=yes
IGNORE_SERVICES_FROM_RESTART="dbus"
+SERVICES_TRIGGERING_REBOOT="dbus"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.6/src/os-update.in
new/os-update-1.7/src/os-update.in
--- old/os-update-1.6/src/os-update.in 2022-12-05 14:43:56.000000000 +0100
+++ new/os-update-1.7/src/os-update.in 2022-12-19 13:14:11.000000000 +0100
@@ -23,6 +23,7 @@
REBOOT_CMD="auto"
RESTART_SERVICES="yes"
IGNORE_SERVICES_FROM_RESTART="dbus"
+SERVICES_TRIGGERING_REBOOT="dbus"
# Additional variables per package manager
ZYPPER_NONINTERACTIVE="-y --auto-agree-with-product-licenses"
@@ -56,11 +57,11 @@
check_and_reboot() {
needs-restarting -r
- if [ $? -eq 1 ]; then
+ if [ $? -eq 1 ] || [ "$reboottrigger" = "yes" ]; then
case "$REBOOT_CMD" in
"auto")
if [ -x /usr/sbin/rebootmgrctl ]; then
- if ! /usr/sbin/rebootmgrctl is-active -q; then
+ if /usr/sbin/rebootmgrctl is-active -q; then
/usr/sbin/rebootmgrctl reboot
else
systemctl reboot
@@ -121,7 +122,15 @@
log_info "Reexecing systemd"
systemctl daemon-reexec;
fi
+ reboottrigger="no"
for service in $(zypper ps --print %s); do
+ for rebootservice in $SERVICES_TRIGGERING_REBOOT; do
+ if [ "$rebootservice" = "$service" ]; then
+ log_info "$service triggers a reboot as it is excluded in
SERVICES_TRIGGERING_REBOOT"
+ reboottrigger="yes"
+ break
+ fi
+ done
for ignore in $IGNORE_SERVICES_FROM_RESTART; do
if [ "$ignore" = "$service" ]; then
log_info "Not restarting $service as it is excluded in
IGNORE_SERVICES_FROM_RESTART"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-update-1.6/systemd/Makefile.in
new/os-update-1.7/systemd/Makefile.in
--- old/os-update-1.6/systemd/Makefile.in 2022-12-05 14:44:59.000000000
+0100
+++ new/os-update-1.7/systemd/Makefile.in 2022-12-19 13:16:03.000000000
+0100
@@ -249,9 +249,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
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
