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 2022-09-08 14:21:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/health-checker (Old) and /work/SRC/openSUSE:Factory/.health-checker.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "health-checker" Thu Sep 8 14:21:13 2022 rev:19 rq:1001409 version:1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/health-checker/health-checker.changes 2021-11-20 22:48:14.367820632 +0100 +++ /work/SRC/openSUSE:Factory/.health-checker.new.2083/health-checker.changes 2022-09-08 14:21:30.298366278 +0200 @@ -1,0 +2,8 @@ +Tue Sep 6 09:39:18 UTC 2022 - Ignaz Forster <ifors...@suse.com> + +- Update to version 1.7 + * Before rollback make sure /.snapshots is mounted rw + * Fix typos and spelling errors. Note: in case an application is + parsing the output it will need to adopt to the new strings. + +------------------------------------------------------------------- Old: ---- health-checker-1.6.tar.xz New: ---- health-checker-1.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ health-checker.spec ++++++ --- /var/tmp/diff_new_pack.7EdHdi/_old 2022-09-08 14:21:30.706367376 +0200 +++ /var/tmp/diff_new_pack.7EdHdi/_new 2022-09-08 14:21:30.710367387 +0200 @@ -1,7 +1,7 @@ # # spec file for package health-checker # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 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.6 +Version: 1.7 Release: 0 Summary: Service for verifying that important services are running License: GPL-2.0-only ++++++ health-checker-1.6.tar.xz -> health-checker-1.7.tar.xz ++++++ ++++ 3228 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/health-checker-1.6/NEWS new/health-checker-1.7/NEWS --- old/health-checker-1.6/NEWS 2021-11-12 19:20:58.000000000 +0100 +++ new/health-checker-1.7/NEWS 2022-09-06 11:26:36.000000000 +0200 @@ -2,6 +2,11 @@ Copyright (C) 2017-2020 Thorsten Kukuk et al. +Version 1.7 +* Before rollback make sure /.snapshots is mounted rw +* Fix typos and spelling errors. Note: in case an application is parsing + the output it will need to adopt to the new strings. + Version 1.6 * Adapt rd.retry to also trigger initqueue timeout tasks [gh#kubic-project/health-checker#11] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/health-checker-1.6/configure.ac new/health-checker-1.7/configure.ac --- old/health-checker-1.6/configure.ac 2021-11-12 19:20:35.000000000 +0100 +++ new/health-checker-1.7/configure.ac 2022-09-06 11:27:05.000000000 +0200 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(health-checker, 1.6) +AC_INIT(health-checker, 1.7) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/health-checker-1.6/sbin/health-checker.in new/health-checker-1.7/sbin/health-checker.in --- old/health-checker-1.6/sbin/health-checker.in 2021-09-30 14:54:40.000000000 +0200 +++ new/health-checker-1.7/sbin/health-checker.in 2022-08-01 18:16:18.000000000 +0200 @@ -3,11 +3,11 @@ # # Check health state of the system # -# Check, if important services are started and running. If this is not the +# Check whether important services are started and running. If this is not the # case: # - on first boot after update, rollback to old snapshot # - if it is not the first boot, reboot -# - if reboot does not help, log this +# - if reboot does not help, stop system before further damage is done # STATE_FILE=/var/lib/misc/health-check.state @@ -63,8 +63,8 @@ # Log via telemetrics if available if [ -x /usr/bin/telem-record-gen ]; then echo -e "${TELEM_PAYLOAD}" | /usr/bin/telem-record-gen -s $TELEM_SEVERITY -c "org.opensuse/health/boot" - # Communiction is async, give daemon time to send data - # before we reboot + # Communication is async, give daemon time to send data + # before reboot test "$1" = "1" && sleep 2 fi } @@ -81,17 +81,18 @@ rollback() { . ${STATE_FILE} + mount -o remount,rw /.snapshots btrfs subvolume set-default ${LAST_WORKING_BTRFS_ID} /.snapshots if [ $? -ne 0 ]; then create_log user.crit "ERROR: btrfs set-default $BTRFS_ID_DEFAULT failed!" - telem_send_playload 1 + telem_send_payload 1 exit 1 fi } stop_services() { - # stop all services + # Stop all services for script in ${PLUGINDIR}/* ${USR_LOCAL_PLUGINDIR}/*; do if [ -f ${script} ]; then ${script} stop @@ -102,8 +103,8 @@ error_decission() { if [ ! -f ${STATE_FILE} ]; then - # No state file, no successfull boot - create_log user.emerg "Machine didn't come up correct, stop services" + # No state file, no successful boot + create_log user.emerg "Machine didn't come up correctly, stopping services" stop_services return fi @@ -114,22 +115,22 @@ if [ ${BTRFS_ID_DEFAULT} -ne ${BTRFS_ID_CURRENT} ]; then # Don't tamper with system if not booted into default snapshot - create_log user.alert "Machine didn't come up correct, trying rebooting into default snapshot" + create_log user.alert "Machine didn't come up correctly, trying rebooting into default snapshot" systemctl reboot elif [ ${LAST_WORKING_BTRFS_ID} -ne ${BTRFS_ID_DEFAULT} ]; then - create_log user.alert "Machine didn't come up correct, do a rollback" + create_log user.alert "Machine didn't come up correctly, do a rollback" rollback if [ $? -eq 0 ]; then telem_send_record 1 systemctl reboot fi elif [ ! -f ${REBOOTED_STATE} ]; then - create_log user.crit "Machine didn't come up correct, try a reboot" + create_log user.crit "Machine didn't come up correctly, trying a reboot" echo `date "+%Y-%m-%d %H:%M"` > ${REBOOTED_STATE} telem_send_record 1 systemctl reboot else - create_log user.emerg "Machine didn't come up correct, starting emergency shell" + create_log user.emerg "Machine didn't come up correctly, starting emergency shell" stop_services systemctl start emergency.target fi