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 2023-10-29 19:39:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-update (Old) and /work/SRC/openSUSE:Factory/.os-update.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-update" Sun Oct 29 19:39:53 2023 rev:16 rq:1115961 version:1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/os-update/os-update.changes 2023-05-08 17:24:50.584893558 +0200 +++ /work/SRC/openSUSE:Factory/.os-update.new.17445/os-update.changes 2023-10-29 19:40:06.551685006 +0100 @@ -1,0 +2,6 @@ +Thu Oct 5 13:28:09 UTC 2023 - Thorsten Kukuk <[email protected]> + +- Update to version 1.12 + - Add support for systemd soft-reboot + +------------------------------------------------------------------- Old: ---- os-update-1.11.tar.xz New: ---- os-update-1.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-update.spec ++++++ --- /var/tmp/diff_new_pack.HsKChe/_old 2023-10-29 19:40:07.075704070 +0100 +++ /var/tmp/diff_new_pack.HsKChe/_new 2023-10-29 19:40:07.079704215 +0100 @@ -21,7 +21,7 @@ %endif Name: os-update -Version: 1.11 +Version: 1.12 Release: 0 Summary: Updates the system regularly to stay current and safe License: GPL-2.0-or-later @@ -34,6 +34,9 @@ %if 0%{?suse_version} >= 1500 Requires: zypper-needs-restarting %endif +%if 0%{?suse_version} >= 1600 +Requires: zypp-boot-plugin >= 0.0.4 +%endif Recommends: rebootmgr Recommends: systemd-status-mail BuildArch: noarch ++++++ os-update-1.11.tar.xz -> os-update-1.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.11/NEWS new/os-update-1.12/NEWS --- old/os-update-1.11/NEWS 2023-04-27 15:30:41.000000000 +0200 +++ new/os-update-1.12/NEWS 2023-10-05 15:17:46.000000000 +0200 @@ -1,3 +1,6 @@ +Version 1.12 + - Add support for soft-reboot + Version 1.11 - Add LOG_TAG - Fix reboottrigger for SLES12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.11/configure new/os-update-1.12/configure --- old/os-update-1.11/configure 2023-04-27 15:30:52.000000000 +0200 +++ new/os-update-1.12/configure 2023-10-05 15:18:23.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.11. +# Generated by GNU Autoconf 2.69 for os-update 1.12. # # # 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.11' -PACKAGE_STRING='os-update 1.11' +PACKAGE_VERSION='1.12' +PACKAGE_STRING='os-update 1.12' 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.11 to adapt to many kinds of systems. +\`configure' configures os-update 1.12 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.11:";; + short | recursive ) echo "Configuration of os-update 1.12:";; 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.11 +os-update configure 1.12 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.11, which was +It was created by os-update $as_me 1.12, 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.11' + VERSION='1.12' 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.11, which was +This file was extended by os-update $as_me 1.12, 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.11 +os-update config.status 1.12 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.11/configure.ac new/os-update-1.12/configure.ac --- old/os-update-1.11/configure.ac 2023-04-27 15:30:08.000000000 +0200 +++ new/os-update-1.12/configure.ac 2023-10-05 15:18:18.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(os-update, 1.11) +AC_INIT(os-update, 1.12) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) @@ -23,5 +23,4 @@ AC_PROG_INSTALL AC_PROG_LN_S -AC_OUTPUT([Makefile src/Makefile src/os-update \ - systemd/Makefile]) +AC_OUTPUT([Makefile src/Makefile src/os-update systemd/Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.11/src/os-update.8 new/os-update-1.12/src/os-update.8 --- old/os-update-1.11/src/os-update.8 2023-04-27 15:29:51.000000000 +0200 +++ new/os-update-1.12/src/os-update.8 2023-10-05 15:25:21.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pandoc 2.17.1.1 +.\" Automatically generated by Pandoc 2.18 .\" .\" Define V font for inline verbatim, using C font in formats .\" that render this, and otherwise B font. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.11/src/os-update.in new/os-update-1.12/src/os-update.in --- old/os-update-1.11/src/os-update.in 2023-04-27 15:29:32.000000000 +0200 +++ new/os-update-1.12/src/os-update.in 2023-10-05 15:17:23.000000000 +0200 @@ -21,9 +21,11 @@ PKG_MANAGER="zypper" UPDATE_CMD="auto" REBOOT_CMD="auto" +REBOOT_METHOD="reboot" RESTART_SERVICES="yes" IGNORE_SERVICES_FROM_RESTART="dbus" SERVICES_TRIGGERING_REBOOT="dbus" +RETVAL=0 # Additional variables per package manager ZYPPER_NONINTERACTIVE="-y --auto-agree-with-product-licenses" @@ -68,6 +70,13 @@ needs-restarting -r if [ $? -eq 1 ] ; then reboottrigger="yes" + if [ -f "/run/reboot-needed" ] && [ -s "/run/reboot-needed" ]; then + case $(cat /run/reboot-needed) in + "soft-reboot") + REBOOT_METHOD="soft-reboot" + ;; + esac + fi fi else release=$(uname -r) @@ -85,12 +94,12 @@ "auto") if [ -x /usr/sbin/rebootmgrctl ]; then if /usr/sbin/rebootmgrctl is-active -q; then - /usr/sbin/rebootmgrctl reboot + /usr/sbin/rebootmgrctl $REBOOT_METHOD else - systemctl reboot + systemctl $REBOOT_METHOD fi else - systemctl reboot + systemctl $REBOOT_METHOD fi ;; "rebootmgr") @@ -102,13 +111,13 @@ log_error "ERROR: rebootmgrd not running" exit 1 fi - /usr/sbin/rebootmgrctl reboot + /usr/sbin/rebootmgrctl $REBOOT_METHOD ;; "reboot") - systemctl reboot + systemctl $REBOOT_METHOD ;; "no"|"none") - log_info "A reboot is required" + log_info "A $REBOOT_METHOD is required" ;; esac fi @@ -121,7 +130,9 @@ log_info "Update was successful" else log_error "ERROR: update failed, exit code was ${RETVAL}" - exit 1 + if [ "$RETVAL" -ne 106 ]; then + exit 1 + fi fi } @@ -251,4 +262,4 @@ check_and_reboot -exit 0 +exit $RETVAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-update-1.11/src/systemd-status-mail.8 new/os-update-1.12/src/systemd-status-mail.8 --- old/os-update-1.11/src/systemd-status-mail.8 2023-01-13 14:14:45.000000000 +0100 +++ new/os-update-1.12/src/systemd-status-mail.8 2023-10-05 15:25:21.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pandoc 2.17.1.1 +.\" Automatically generated by Pandoc 2.18 .\" .\" Define V font for inline verbatim, using C font in formats .\" that render this, and otherwise B font.
