Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package health-checker for openSUSE:Factory checked in at 2023-05-10 16:16:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/health-checker (Old) and /work/SRC/openSUSE:Factory/.health-checker.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "health-checker" Wed May 10 16:16:19 2023 rev:20 rq:1085633 version:1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/health-checker/health-checker.changes 2022-09-08 14:21:30.298366278 +0200 +++ /work/SRC/openSUSE:Factory/.health-checker.new.1533/health-checker.changes 2023-05-10 16:16:21.598206465 +0200 @@ -1,0 +2,13 @@ +Mon May 8 22:12:48 UTC 2023 - Ignaz Forster <[email protected]> + +- Update to version 1.8 + * Don't rely on t-u's good states in GRUB + With the introduction of the "apply" command in + transactional-update the snapshots don't require a reboot any + more to be registered as a "good" snapshot. Due to + [boo#1048088] the GRUB part of health-checker was using the t-u + file as a workaround which cannot be done any more now, so + store the last good snapshot path from a health-checker + perspective independently now. + +------------------------------------------------------------------- Old: ---- health-checker-1.7.tar.xz New: ---- health-checker-1.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ health-checker.spec ++++++ --- /var/tmp/diff_new_pack.sYcsIS/_old 2023-05-10 16:16:22.086209352 +0200 +++ /var/tmp/diff_new_pack.sYcsIS/_new 2023-05-10 16:16:22.094209398 +0200 @@ -1,7 +1,7 @@ # # spec file for package health-checker # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define _dracutmoduledir %(pkg-config --variable=dracutmodulesdir dracut) Name: health-checker -Version: 1.7 +Version: 1.8 Release: 0 Summary: Service for verifying that important services are running License: GPL-2.0-only ++++++ health-checker-1.7.tar.xz -> health-checker-1.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.7/NEWS new/health-checker-1.8/NEWS --- old/health-checker-1.7/NEWS 2022-09-06 11:26:36.000000000 +0200 +++ new/health-checker-1.8/NEWS 2023-05-09 00:48:17.000000000 +0200 @@ -2,6 +2,12 @@ Copyright (C) 2017-2020 Thorsten Kukuk et al. +Version 1.8 +* Don't rely on t-u's good states in GRUB + With the introduction of the "apply" command in transactional-update the + snapshot id's cannnot be reused any more. Due to that store the snapshot + number separately now, too. + Version 1.7 * Before rollback make sure /.snapshots is mounted rw * Fix typos and spelling errors. Note: in case an application is parsing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.7/configure new/health-checker-1.8/configure --- old/health-checker-1.7/configure 2022-09-06 11:33:09.000000000 +0200 +++ new/health-checker-1.8/configure 2023-05-09 00:54:14.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for health-checker 1.7. +# Generated by GNU Autoconf 2.71 for health-checker 1.8. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -607,8 +607,8 @@ # Identity of this package. PACKAGE_NAME='health-checker' PACKAGE_TARNAME='health-checker' -PACKAGE_VERSION='1.7' -PACKAGE_STRING='health-checker 1.7' +PACKAGE_VERSION='1.8' +PACKAGE_STRING='health-checker 1.8' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1258,7 +1258,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 health-checker 1.7 to adapt to many kinds of systems. +\`configure' configures health-checker 1.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1325,7 +1325,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of health-checker 1.7:";; + short | recursive ) echo "Configuration of health-checker 1.8:";; esac cat <<\_ACEOF @@ -1420,7 +1420,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -health-checker configure 1.7 +health-checker configure 1.8 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1457,7 +1457,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by health-checker $as_me 1.7, which was +It was created by health-checker $as_me 1.8, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2409,7 +2409,7 @@ # Define the identity of the package. PACKAGE='health-checker' - VERSION='1.7' + VERSION='1.8' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3479,7 +3479,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by health-checker $as_me 1.7, which was +This file was extended by health-checker $as_me 1.8, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3534,7 +3534,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -health-checker config.status 1.7 +health-checker config.status 1.8 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.7/configure.ac new/health-checker-1.8/configure.ac --- old/health-checker-1.7/configure.ac 2022-09-06 11:27:05.000000000 +0200 +++ new/health-checker-1.8/configure.ac 2023-05-09 00:48:17.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(health-checker, 1.7) +AC_INIT(health-checker, 1.8) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.7/grub/05_health_check new/health-checker-1.8/grub/05_health_check --- old/health-checker-1.7/grub/05_health_check 2020-01-29 15:37:39.000000000 +0100 +++ new/health-checker-1.8/grub/05_health_check 2023-05-09 00:45:22.000000000 +0200 @@ -18,12 +18,24 @@ btrfs-mount-subvol (\${root}) /var /@/var btrfs-mount-subvol (\${root}) /var/lib/misc /@/var/lib/misc + if [ -e /var/lib/misc/health-checker.state ]; then + source /var/lib/misc/health-checker.state + if [ -n \${LAST_WORKING_SNAPSHOT} ]; then + LAST_WORKING_SNAPSHOTS=\${LAST_WORKING_SNAPSHOT} + fi + fi + + # Backwards compatibility (for state file created with old + # health-checker versions): # Due to boo#1048088 btrfs-list-subvols currently doesn't give a list of # subvolumes, so it's not possible to map # /var/lib/misc/health-checker.state to a snapshot directory; use # transactional-update state file as a workaround. - if [ -e /var/lib/misc/transactional-update.state ]; then + if [ -z \${LAST_WORKING_SNAPSHOTS} -a -e /var/lib/misc/transactional-update.state ]; then source /var/lib/misc/transactional-update.state + fi + + if [ -n "\${LAST_WORKING_SNAPSHOTS}" ]; then btrfs-mount-subvol (\$root) /.snapshots @/.snapshots for snapshot in \${LAST_WORKING_SNAPSHOTS}; do if [ -e "/.snapshots/\${snapshot}/grub-snapshot.cfg" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.7/sbin/health-checker.in new/health-checker-1.8/sbin/health-checker.in --- old/health-checker-1.7/sbin/health-checker.in 2022-08-01 18:16:18.000000000 +0200 +++ new/health-checker-1.8/sbin/health-checker.in 2023-05-09 00:45:22.000000000 +0200 @@ -18,11 +18,13 @@ TELEM_PAYLOAD="" BTRFS_ID_DEFAULT=0 +SNAPSHOT_DEFAULT="" BTRFS_ID_CURRENT=0 set_btrfs_id() { BTRFS_ID_DEFAULT=`btrfs subvolume get-default / | awk '{print $2}'` + SNAPSHOT_DEFAULT="`btrfs subvolume get-default / | cut -d ' ' -f 9-`" BTRFS_ID_CURRENT=`findmnt --output OPTIONS --noheadings / | sed -e 's|.*subvolid=\([0-9]\+\).*|\1|g'` } @@ -75,6 +77,7 @@ if [ ${BTRFS_ID_DEFAULT} -eq ${BTRFS_ID_CURRENT} ]; then echo "LAST_WORKING_BTRFS_ID=${BTRFS_ID_DEFAULT}" > $STATE_FILE + echo "LAST_WORKING_SNAPSHOT=${SNAPSHOT_DEFAULT}" >> $STATE_FILE fi }
