Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rebootmgr for openSUSE:Factory
checked in at 2024-03-17 22:10:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rebootmgr (Old)
and /work/SRC/openSUSE:Factory/.rebootmgr.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rebootmgr"
Sun Mar 17 22:10:50 2024 rev:26 rq:1158226 version:2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/rebootmgr/rebootmgr.changes 2024-03-09
20:53:51.404770759 +0100
+++ /work/SRC/openSUSE:Factory/.rebootmgr.new.1905/rebootmgr.changes
2024-03-17 22:10:56.437281898 +0100
@@ -1,0 +2,7 @@
+Fri Mar 15 12:34:51 UTC 2024 - Thorsten Kukuk <ku...@suse.com>
+
+- Update to version 2.4
+ - Make sure systemctl reboot will not switch to soft-reboot
+ automatically
+
+-------------------------------------------------------------------
Old:
----
rebootmgr-2.3.tar.xz
New:
----
rebootmgr-2.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rebootmgr.spec ++++++
--- /var/tmp/diff_new_pack.MrsINg/_old 2024-03-17 22:10:56.885298230 +0100
+++ /var/tmp/diff_new_pack.MrsINg/_new 2024-03-17 22:10:56.885298230 +0100
@@ -24,7 +24,7 @@
%endif
Name: rebootmgr
-Version: 2.3
+Version: 2.4
Release: 0
Summary: Automatic controlled reboot during a maintenance window
License: GPL-2.0-only AND LGPL-2.1-or-later
++++++ rebootmgr-2.3.tar.xz -> rebootmgr-2.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rebootmgr-2.3/NEWS new/rebootmgr-2.4/NEWS
--- old/rebootmgr-2.3/NEWS 2024-03-08 10:45:18.000000000 +0100
+++ new/rebootmgr-2.4/NEWS 2024-03-14 14:00:17.000000000 +0100
@@ -2,6 +2,9 @@
Copyright (C) 2016-2024 Thorsten Kukuk
+Version 2.4
+* Make sure systemctl reboot will not switch to soft-reboot automatically
+
Version 2.3
* Add verbose option to rebootmgrd
* Enable verbose option for rebootmgrd in service file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rebootmgr-2.3/configure new/rebootmgr-2.4/configure
--- old/rebootmgr-2.3/configure 2024-03-08 10:47:50.000000000 +0100
+++ new/rebootmgr-2.4/configure 2024-03-14 14:00:50.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rebootmgr 2.3.
+# Generated by GNU Autoconf 2.69 for rebootmgr 2.4.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='rebootmgr'
PACKAGE_TARNAME='rebootmgr'
-PACKAGE_VERSION='2.3'
-PACKAGE_STRING='rebootmgr 2.3'
+PACKAGE_VERSION='2.4'
+PACKAGE_STRING='rebootmgr 2.4'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1295,7 +1295,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 rebootmgr 2.3 to adapt to many kinds of systems.
+\`configure' configures rebootmgr 2.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1361,7 +1361,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rebootmgr 2.3:";;
+ short | recursive ) echo "Configuration of rebootmgr 2.4:";;
esac
cat <<\_ACEOF
@@ -1473,7 +1473,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rebootmgr configure 2.3
+rebootmgr configure 2.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1838,7 +1838,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rebootmgr $as_me 2.3, which was
+It was created by rebootmgr $as_me 2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2701,7 +2701,7 @@
# Define the identity of the package.
PACKAGE='rebootmgr'
- VERSION='2.3'
+ VERSION='2.4'
cat >>confdefs.h <<_ACEOF
@@ -6410,7 +6410,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rebootmgr $as_me 2.3, which was
+This file was extended by rebootmgr $as_me 2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6476,7 +6476,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rebootmgr config.status 2.3
+rebootmgr config.status 2.4
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/rebootmgr-2.3/configure.ac
new/rebootmgr-2.4/configure.ac
--- old/rebootmgr-2.3/configure.ac 2024-03-08 10:44:18.000000000 +0100
+++ new/rebootmgr-2.4/configure.ac 2024-03-14 13:59:50.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(rebootmgr, 2.3)
+AC_INIT(rebootmgr, 2.4)
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([src/rebootmgrd.c])
AM_CONFIG_HEADER(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rebootmgr-2.3/src/rebootmgrd.c
new/rebootmgr-2.4/src/rebootmgrd.c
--- old/rebootmgr-2.3/src/rebootmgrd.c 2024-03-08 10:38:36.000000000 +0100
+++ new/rebootmgr-2.4/src/rebootmgrd.c 2024-03-13 15:57:50.000000000 +0100
@@ -127,6 +127,7 @@
log_msg (LOG_INFO, "rebootmgr: soft-reboot triggered now!");
else
log_msg (LOG_INFO, "rebootmgr: reboot triggered now!");
+
pid_t pid = fork();
if (pid < 0)
@@ -146,8 +147,11 @@
}
else
{
- if (execl ("/usr/bin/systemctl", "systemctl", "reboot",
- NULL) == -1)
+ char envar1[] = "SYSTEMCTL_SKIP_AUTO_SOFT_REBOOT=1";
+ char *env[] = {envar1, NULL};
+
+ if (execle ("/usr/bin/systemctl", "systemctl", "reboot",
+ NULL, env) == -1)
{
log_msg (LOG_ERR, "Calling /usr/bin/systemctl reboot
failed: %m");
exit (1);
