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 2024-05-09 13:12:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-update (Old) and /work/SRC/openSUSE:Factory/.os-update.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-update" Thu May 9 13:12:46 2024 rev:22 rq:1172738 version:1.17 Changes: -------- --- /work/SRC/openSUSE:Factory/os-update/os-update.changes 2024-03-11 15:43:03.914601761 +0100 +++ /work/SRC/openSUSE:Factory/.os-update.new.1880/os-update.changes 2024-05-09 13:13:04.208609069 +0200 @@ -1,0 +2,6 @@ +Wed May 8 12:48:41 UTC 2024 - Thorsten Kukuk <[email protected]> + +- Update to version 1.17 + - Implement soft-reboot support for non restartable services + +------------------------------------------------------------------- Old: ---- os-update-1.16.tar.xz New: ---- os-update-1.17.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-update.spec ++++++ --- /var/tmp/diff_new_pack.LtERla/_old 2024-05-09 13:13:06.220682657 +0200 +++ /var/tmp/diff_new_pack.LtERla/_new 2024-05-09 13:13:06.220682657 +0200 @@ -21,7 +21,7 @@ %endif Name: os-update -Version: 1.16 +Version: 1.17 Release: 0 Summary: Updates the system regularly to stay current and safe License: GPL-2.0-or-later ++++++ os-update-1.16.tar.xz -> os-update-1.17.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.16/NEWS new/os-update-1.17/NEWS --- old/os-update-1.16/NEWS 2024-03-11 11:13:10.000000000 +0100 +++ new/os-update-1.17/NEWS 2024-05-08 14:45:12.000000000 +0200 @@ -1,3 +1,6 @@ +Version 1.17 +- Implement soft-reboot support for non restartable services + Version 1.16 - Enhance logging for selected reboot method diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.16/configure new/os-update-1.17/configure --- old/os-update-1.16/configure 2024-03-08 15:06:43.000000000 +0100 +++ new/os-update-1.17/configure 2024-05-08 14:45:30.000000000 +0200 @@ -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.16. +# Generated by GNU Autoconf 2.69 for os-update 1.17. # # # 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.16' -PACKAGE_STRING='os-update 1.16' +PACKAGE_VERSION='1.17' +PACKAGE_STRING='os-update 1.17' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1216,7 +1216,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.16 to adapt to many kinds of systems. +\`configure' configures os-update 1.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1282,7 +1282,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of os-update 1.16:";; + short | recursive ) echo "Configuration of os-update 1.17:";; esac cat <<\_ACEOF @@ -1375,7 +1375,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -os-update configure 1.16 +os-update configure 1.17 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1392,7 +1392,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.16, which was +It was created by os-update $as_me 1.17, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2255,7 +2255,7 @@ # Define the identity of the package. PACKAGE='os-update' - VERSION='1.16' + VERSION='1.17' cat >>confdefs.h <<_ACEOF @@ -3152,7 +3152,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.16, which was +This file was extended by os-update $as_me 1.17, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3205,7 +3205,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.16 +os-update config.status 1.17 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.16/configure.ac new/os-update-1.17/configure.ac --- old/os-update-1.16/configure.ac 2024-03-08 15:06:37.000000000 +0100 +++ new/os-update-1.17/configure.ac 2024-05-08 14:45:20.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(os-update, 1.16) +AC_INIT(os-update, 1.17) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.16/src/os-update.8 new/os-update-1.17/src/os-update.8 --- old/os-update-1.16/src/os-update.8 2023-10-05 15:25:21.000000000 +0200 +++ new/os-update-1.17/src/os-update.8 2024-05-08 14:45:35.000000000 +0200 @@ -1,52 +1,35 @@ -.\" Automatically generated by Pandoc 2.18 +.\" Automatically generated by Pandoc 3.1.11.1 .\" -.\" Define V font for inline verbatim, using C font in formats -.\" that render this, and otherwise B font. -.ie "\f[CB]x\f[]"x" \{\ -. ftr V B -. ftr VI BI -. ftr VB B -. ftr VBI BI -.\} -.el \{\ -. ftr V CR -. ftr VI CI -. ftr VB CB -. ftr VBI CBI -.\} -.TH "os-update" "8" "" "" "" -.hy +.TH "os\-update" "8" "" "" "" .SH NAME -.PP -\f[B]os-update\f[R] - Update automatically packages and reboot if +\f[B]os\-update\f[R] \- Update automatically packages and reboot if necessary .SH SYNOPSIS .PP -\f[B]/usr/libexec/os-update\f[R] +\f[B]/usr/libexec/os\-update\f[R] .PD 0 .P .PD -\f[B]/usr/lib/systemd/system/os-update.service\f[R] +\f[B]/usr/lib/systemd/system/os\-update.service\f[R] .PD 0 .P .PD -\f[B]/usr/lib/systemd/system/os-update.timer\f[R] +\f[B]/usr/lib/systemd/system/os\-update.timer\f[R] .SH DESCRIPTION -.PP -\f[V]os-update\f[R] runs daily via the \f[V]os-update.timer\f[R] systemd -timer and updates the system in a defined way. +\f[CR]os\-update\f[R] runs daily via the \f[CR]os\-update.timer\f[R] +systemd timer and updates the system in a defined way. If the updated packages require a reboot, either rebootmgr is notified -(if running) or a reboot is done via \f[V]systemctl reboot\f[R]. +(if running) or a reboot is done via \f[CR]systemctl reboot\f[R]. .PP -The os-update.timer can be configured like any other systemd timer to +The os\-update.timer can be configured like any other systemd timer to run at the best fitting time. .PP It can be configured to do a full system upgrade -(e.g.\ \f[V]zypper dup\f[R] for rolling release distributions like +(e.g.\ \f[CR]zypper dup\f[R] for rolling release distributions like \f[I]openSUSE Tumbleweed\f[R]), to update only packages -(e.g.\ \f[V]zypper up\f[R] for something like \f[I]SUSE Linux +(e.g.\ \f[CR]zypper up\f[R] for something like \f[I]SUSE Linux Enterprise\f[R]) or to apply only security updates -(e.g.\ \f[V]zypper patch --category security\f[R]). +(e.g.\ \f[CR]zypper patch \-\-category security\f[R]). .SH CONFIGURATION OPTIONS .TP UPDATE_CMD=\[lq]auto\[rq] @@ -61,7 +44,7 @@ Valid values are \[lq]auto\[rq], \[lq]rebootmgr\[rq], \[lq]reboot\[rq] and \[lq]none\[rq]. \[lq]auto\[rq] will use rebootmgr if installed and running, else -\f[V]systemctl reboot\f[R]. +\f[CR]systemctl reboot\f[R]. \[lq]none\[rq] will only print an informative message that a reboot is required, but not trigger any. .TP @@ -70,24 +53,27 @@ restarted, if they are still using old libraries. .TP IGNORE_SERVICES_FROM_RESTART=\[lq]dbus\[rq] -Specifies a list of services which should not be restarted +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 +SERVICES_TRIGGERING_SOFT_REBOOT=\[lq]dbus\[rq] +Specifies a list of services which trigger a soft\-reboot. +If anything else triggers a real reboot, a full reboot is performed. +.TP +SERVICES_TRIGGERING_REBOOT=\[lq]\[rq] +Specifies a list of services which trigger a full reboot. .TP LOG_TAG=\[lq]root\[rq] Specifies a custom log identifier .SH CONFIGURATION FILES .TP -/usr/etc/os-update.conf +/usr/etc/os\-update.conf Vendor provided configuration file, contains the defaults. .TP -/etc/os-update.conf +/etc/os\-update.conf Admin provided configuration file, should only contain the variables which were changed by the system administrator compared to the vendor configuration file. .SH SEE ALSO -.PP -systemd.timer(5), systemd-status-mail(8) +systemd.timer(5), systemd\-status\-mail(8) .SH AUTHORS -Thorsten Kukuk \f[V]<kukuk\[at]thkukuk.de>\f[R]. +Thorsten Kukuk \f[CR]<kukuk\[at]thkukuk.de>\f[R]. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.16/src/os-update.8.md new/os-update-1.17/src/os-update.8.md --- old/os-update-1.16/src/os-update.8.md 2023-04-28 11:44:55.000000000 +0200 +++ new/os-update-1.17/src/os-update.8.md 2024-05-08 14:41:03.000000000 +0200 @@ -44,10 +44,13 @@ restarted, if they are still using old libraries. IGNORE_SERVICES_FROM_RESTART="dbus" -: Specifies a list of services which should not be restarted +: Specifies a list of services which should not be restarted. -SERVICES_TRIGGERING_REBOOT="dbus" -: Specifies a list of services which trigger a reboot +SERVICES_TRIGGERING_SOFT_REBOOT="dbus" +: Specifies a list of services which trigger a soft-reboot. If anything else triggers a real reboot, a full reboot is performed. + +SERVICES_TRIGGERING_REBOOT="" +: Specifies a list of services which trigger a full reboot. LOG_TAG="root" : Specifies a custom log identifier diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.16/src/os-update.conf new/os-update-1.17/src/os-update.conf --- old/os-update-1.16/src/os-update.conf 2023-11-23 14:24:19.000000000 +0100 +++ new/os-update-1.17/src/os-update.conf 2024-05-08 14:33:35.000000000 +0200 @@ -2,4 +2,5 @@ REBOOT_CMD=auto RESTART_SERVICES=yes IGNORE_SERVICES_FROM_RESTART="dbus virtlockd" -SERVICES_TRIGGERING_REBOOT="dbus" +SERVICES_TRIGGERING_REBOOT="" +SERVICES_TRIGGERING_SOFT_REBOOT="dbus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.16/src/os-update.in new/os-update-1.17/src/os-update.in --- old/os-update-1.16/src/os-update.in 2024-03-08 14:42:17.000000000 +0100 +++ new/os-update-1.17/src/os-update.in 2024-05-08 14:36:10.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2020-2023 Thorsten Kukuk <[email protected]> +# Copyright (C) 2020-2024 Thorsten Kukuk <[email protected]> # # 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 @@ -24,7 +24,8 @@ REBOOT_METHOD="reboot" RESTART_SERVICES="yes" IGNORE_SERVICES_FROM_RESTART="dbus virtlockd" -SERVICES_TRIGGERING_REBOOT="dbus" +SERVICES_TRIGGERING_REBOOT="" +SERVICES_TRIGGERING_SOFT_REBOOT="dbus" RETVAL=0 LOG_TAG="os-update" @@ -79,9 +80,12 @@ ;; *) log_info "Update suggests reboot with $(cat /run/reboot-needed), using hard reboot" + REBOOT_METHOD="reboot" + ;; esac else log_info "Update suggests reboot" + REBOOT_METHOD="reboot" fi fi else @@ -93,6 +97,7 @@ if [[ ${installed} > ${version}.1.$(uname -m) ]] ; then log_info "New kernel detected, trigger reboot" reboottrigger="yes" + REBOOT_METHOD="reboot" fi done fi @@ -170,10 +175,19 @@ fi reboottrigger="no" for service in $(zypper ps --print %s); do + for rebootservice in $SERVICES_TRIGGERING_SOFT_REBOOT; do + if [ "$rebootservice" = "$service" ]; then + log_info "$service triggers a soft-reboot as it is included in SERVICES_TRIGGERING_SOFT_REBOOT" + reboottrigger="yes" + REBOOT_METHOD="soft-reboot" + break + fi + done for rebootservice in $SERVICES_TRIGGERING_REBOOT; do if [ "$rebootservice" = "$service" ]; then log_info "$service triggers a reboot as it is included in SERVICES_TRIGGERING_REBOOT" reboottrigger="yes" + REBOOT_METHOD="reboot" break fi done
