Hello community, here is the log from the commit of package health-checker for openSUSE:Factory checked in at 2020-01-18 12:14:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/health-checker (Old) and /work/SRC/openSUSE:Factory/.health-checker.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "health-checker" Sat Jan 18 12:14:58 2020 rev:12 rq:764488 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/health-checker/health-checker.changes 2019-05-10 09:14:09.463781778 +0200 +++ /work/SRC/openSUSE:Factory/.health-checker.new.26092/health-checker.changes 2020-01-18 12:16:46.407095223 +0100 @@ -1,0 +2,9 @@ +Mon Dec 16 16:37:07 UTC 2019 - Ignaz Forster <[email protected]> + +- Update to version 1.3 + * Support /var on non-root device for reading health data + * Avoid GRUB error message if env_block is not set [boo#1151072] + * Don't show message on manual emergency shell invocation + * Fix handling when booting a non-default snapshot + +------------------------------------------------------------------- Old: ---- health-checker-1.2.3.tar.xz New: ---- health-checker-1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ health-checker.spec ++++++ --- /var/tmp/diff_new_pack.Yj8bED/_old 2020-01-18 12:16:47.295095698 +0100 +++ /var/tmp/diff_new_pack.Yj8bED/_new 2020-01-18 12:16:47.299095701 +0100 @@ -1,7 +1,7 @@ # # spec file for package health-checker # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: health-checker -Version: 1.2.3 +Version: 1.3 Release: 0 Summary: Service for verifying that important services are running License: GPL-2.0-only ++++++ health-checker-1.2.3.tar.xz -> health-checker-1.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/Makefile.in new/health-checker-1.3/Makefile.in --- old/health-checker-1.2.3/Makefile.in 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/Makefile.in 2020-01-14 16:48:30.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -132,7 +132,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -317,8 +317,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -436,7 +436,10 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @case `sed 15q $(srcdir)/NEWS` in \ *"$(VERSION)"*) : ;; \ *) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/NEWS new/health-checker-1.3/NEWS --- old/health-checker-1.2.3/NEWS 2019-05-06 15:56:36.000000000 +0200 +++ new/health-checker-1.3/NEWS 2020-01-14 16:48:00.000000000 +0100 @@ -1,6 +1,12 @@ issue-generator NEWS -- history of user-visible changes. -Copyright (C) 2017-2019 Thorsten Kukuk +Copyright (C) 2017-2019 Thorsten Kukuk et al. + +Version 1.3 +* Support /var on non-root device for reading health data +* Avoid GRUB error message if env_block is not set [boo#1151072] +* Don't show message on manual emergency shell invocation +* Fix handling when booting a non-default snapshot Version 1.2.3 * Fix name of crio RPM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/aclocal.m4 new/health-checker-1.3/aclocal.m4 --- old/health-checker-1.2.3/aclocal.m4 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/aclocal.m4 2020-01-14 16:48:29.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -143,7 +143,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -230,8 +230,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -298,7 +298,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. +that behaves properly: <https://www.gnu.org/software/coreutils/>. If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -340,7 +340,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -361,7 +361,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -382,7 +382,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -421,7 +421,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -452,7 +452,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -533,7 +533,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -593,7 +593,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -621,7 +621,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -640,7 +640,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/configure new/health-checker-1.3/configure --- old/health-checker-1.2.3/configure 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/configure 2020-01-14 16:48:30.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for health-checker 1.2.3. +# Generated by GNU Autoconf 2.69 for health-checker 1.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ # Identity of this package. PACKAGE_NAME='health-checker' PACKAGE_TARNAME='health-checker' -PACKAGE_VERSION='1.2.3' -PACKAGE_STRING='health-checker 1.2.3' +PACKAGE_VERSION='1.3' +PACKAGE_STRING='health-checker 1.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1210,7 +1210,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.2.3 to adapt to many kinds of systems. +\`configure' configures health-checker 1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1276,7 +1276,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of health-checker 1.2.3:";; + short | recursive ) echo "Configuration of health-checker 1.3:";; esac cat <<\_ACEOF @@ -1356,7 +1356,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -health-checker configure 1.2.3 +health-checker configure 1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1373,7 +1373,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.2.3, which was +It was created by health-checker $as_me 1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1721,7 +1721,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.15' +am__api_version='1.16' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2236,7 +2236,7 @@ # Define the identity of the package. PACKAGE='health-checker' - VERSION='1.2.3' + VERSION='1.3' cat >>confdefs.h <<_ACEOF @@ -2266,8 +2266,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -2318,7 +2318,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. +that behaves properly: <https://www.gnu.org/software/coreutils/>. If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3121,7 +3121,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.2.3, which was +This file was extended by health-checker $as_me 1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3174,7 +3174,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -health-checker config.status 1.2.3 +health-checker config.status 1.3 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/health-checker-1.2.3/configure.ac new/health-checker-1.3/configure.ac --- old/health-checker-1.2.3/configure.ac 2019-05-06 15:56:04.000000000 +0200 +++ new/health-checker-1.3/configure.ac 2020-01-14 16:48:00.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(health-checker, 1.2.3) +AC_INIT(health-checker, 1.3) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([sbin/health-checker.in]) AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/dracut/Makefile.in new/health-checker-1.3/dracut/Makefile.in --- old/health-checker-1.2.3/dracut/Makefile.in 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/dracut/Makefile.in 2020-01-14 16:48:30.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -256,8 +256,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -310,7 +310,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/dracut/health-checker-emergency.sh new/health-checker-1.3/dracut/health-checker-emergency.sh --- old/health-checker-1.2.3/dracut/health-checker-emergency.sh 2019-02-04 10:23:51.000000000 +0100 +++ new/health-checker-1.3/dracut/health-checker-emergency.sh 2020-01-14 16:48:00.000000000 +0100 @@ -9,14 +9,23 @@ # - if reboot does not help, log this # -STATE_FILE=/var/lib/misc/health-check.state -REBOOTED_STATE=/var/lib/misc/health-check.rebooted +HC_ROOT_MOUNT="/run/health-checker" +STATE_FILE="${HC_ROOT_MOUNT}/var/lib/misc/health-check.state" +REBOOTED_STATE="${HC_ROOT_MOUNT}/var/lib/misc/health-check.rebooted" BTRFS_ID=0 set_btrfs_id() { - BTRFS_ID=`btrfs subvolume get-default ${NEWROOT} | awk '{print $2}'` + BTRFS_ID=`btrfs subvolume get-default "${HC_ROOT_MOUNT}" | awk '{print $2}'` +} + +umount_and_reboot() +{ + if findmnt "${HC_ROOT_MOUNT}" > /dev/null; then + umount --recursive "${HC_ROOT_MOUNT}" + fi + systemctl reboot --force } clear_and_reboot() @@ -33,14 +42,13 @@ try_grub_recovery() { warn "Trying recovery via GRUB2 snapshot mechanism." - systemctl reboot --force + umount_and_reboot } rollback() { . ${STATE_FILE} - mount -o remount,rw ${NEWROOT} - btrfs subvolume set-default ${LAST_WORKING_BTRFS_ID} ${NEWROOT} + btrfs subvolume set-default ${LAST_WORKING_BTRFS_ID} "${HC_ROOT_MOUNT}" if [ $? -ne 0 ]; then warn "ERROR: btrfs set-default $BTRFS_ID failed!" return 1 @@ -81,8 +89,8 @@ # Make sure we know root device [ -z "$root" ] && root=$(getarg root=) -if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then - info "health checker: manual invocation of emergency shell, doing nothing" +if getargbool 0 rd.break; then + true # manual invocation of emergency shell, doing nothing elif [ -n "$root" -a -z "${root%%block:*}" ]; then info "root device: ${root}" @@ -96,18 +104,22 @@ info "my_root device exist" # Try to mount health-checker data - mkdir -p /run/health-checker - mkdir -p /var/lib - if mount -t btrfs -o subvol=@/var/lib/misc "${my_root}" /run/health-checker; then - ln -s /run/health-checker -t /var/lib/misc - elif mount -t btrfs -o subvol=@/var "${my_root}" /run/health-checker; then - ln -s /run/health-checker/var/lib/misc -t /var/lib/misc + mkdir -p "${HC_ROOT_MOUNT}" + if mount "${my_root}" "${HC_ROOT_MOUNT}"; then + info "my_root mounted successfully" + state_dev_cands=("/var/lib/misc" "/var") + for cand in "${state_dev_cands[@]}"; do + findmnt --first-only --direction backward --noheadings --tab-file "${HC_ROOT_MOUNT}/etc/fstab" "${cand}" | while read _m _d _t _o; do + mkdir -p "${HC_ROOT_MOUNT}/${cand}" + mount -t ${_t} -o ${_o} ${_d} "${HC_ROOT_MOUNT}/${cand}" + done + done fi # Try to recover somehow - if [ -e /var/lib/misc ]; then + if [ -e "${HC_ROOT_MOUNT}/var/lib/misc" ]; then error_decission - umount /run/health-checker ||: + umount --recursive "${HC_ROOT_MOUNT}" ||: else warn "Mounting health-checker data failed." try_grub_recovery diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/grub/05_health_check new/health-checker-1.3/grub/05_health_check --- old/health-checker-1.2.3/grub/05_health_check 2019-02-04 10:23:51.000000000 +0100 +++ new/health-checker-1.3/grub/05_health_check 2020-01-14 16:48:00.000000000 +0100 @@ -11,7 +11,9 @@ # This prevents getting stuck in a loop when booting an entry that # doesn't support this flag yet. health_checker_flag=0 - save_env -f "\${env_block}" health_checker_flag + if [ "\${env_block}" ] ; then + save_env -f "\${env_block}" health_checker_flag + fi # Try to mount /var/lib/misc from know subvolume locations btrfs-mount-subvol (\${root}) /var /@/var btrfs-mount-subvol (\${root}) /var/lib/misc /@/var/lib/misc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/grub/83_health_check_marker new/health-checker-1.3/grub/83_health_check_marker --- old/health-checker-1.2.3/grub/83_health_check_marker 2019-02-04 10:23:51.000000000 +0100 +++ new/health-checker-1.3/grub/83_health_check_marker 2020-01-14 16:48:00.000000000 +0100 @@ -13,7 +13,11 @@ cfgfile="`readlink /proc/$$/fd/1`" if [ -f "$cfgfile" ]; then - lines_to_add='\n\thealth_checker_flag=1\n\tsave_env -f "${env_block}" health_checker_flag' + lines_to_add='\n' + lines_to_add+='\thealth_checker_flag=1\n' + lines_to_add+='\tif [ "${env_block}" ] ; then\n' + lines_to_add+='\t\tsave_env -f "${env_block}" health_checker_flag\n' + lines_to_add+='\tfi' # The sed expression below will inject contents into the opened file; the # original process will not notice that and will continue writing from the @@ -22,7 +26,7 @@ # the final output). echo -n -e $lines_to_add - sed 's/^\(menuentry .*\)/\1\n\thealth_checker_flag=1\n\tsave_env -f "${env_block}" health_checker_flag/' "$cfgfile" > "$cfgfile".health_checker + sed 's/^\(menuentry .*\)/\1'"${lines_to_add}"'/' "$cfgfile" > "$cfgfile".health_checker cp "$cfgfile".health_checker "$cfgfile" rm "$cfgfile".health_checker fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/grub/Makefile.in new/health-checker-1.3/grub/Makefile.in --- old/health-checker-1.2.3/grub/Makefile.in 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/grub/Makefile.in 2020-01-14 16:48:30.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -256,8 +256,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -310,7 +310,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/install-sh new/health-checker-1.3/install-sh --- old/health-checker-1.2.3/install-sh 2019-02-25 16:20:45.000000000 +0100 +++ new/health-checker-1.3/install-sh 2019-12-05 17:52:41.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,34 +332,43 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -427,8 +444,8 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -493,7 +510,7 @@ done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/man/Makefile.in new/health-checker-1.3/man/Makefile.in --- old/health-checker-1.2.3/man/Makefile.in 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/man/Makefile.in 2020-01-14 16:48:30.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -277,8 +277,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -339,7 +339,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/man/health-checker.8 new/health-checker-1.3/man/health-checker.8 --- old/health-checker-1.2.3/man/health-checker.8 2019-02-25 21:36:27.000000000 +0100 +++ new/health-checker-1.3/man/health-checker.8 2019-12-05 17:52:48.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: health-checker .\" Author: Thorsten Kukuk <[email protected]> .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/25/2019 +.\" Date: 12/05/2019 .\" Manual: health-checker .\" Source: health-checker .\" Language: English .\" -.TH "HEALTH\-CHECKER" "8" "02/25/2019" "health-checker" "health-checker" +.TH "HEALTH\-CHECKER" "8" "12/05/2019" "health-checker" "health-checker" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/man/health-checker.8.html new/health-checker-1.3/man/health-checker.8.html --- old/health-checker-1.2.3/man/health-checker.8.html 2019-02-25 21:36:27.000000000 +0100 +++ new/health-checker-1.3/man/health-checker.8.html 2019-12-05 17:52:48.000000000 +0100 @@ -15,7 +15,7 @@ h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { visibility: visible; } - </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.1</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up + </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.2.3</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up correctly after an update and reboot.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> --version </p></div><p><code class="filename">health-checker.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>health-checker</em></span> checks during boot, if the system is coming up correct. In error case, the action depends on what did happen before. If this is the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/man/health-checker.index.html new/health-checker-1.3/man/health-checker.index.html --- old/health-checker-1.2.3/man/health-checker.index.html 2019-02-25 21:36:27.000000000 +0100 +++ new/health-checker-1.3/man/health-checker.index.html 2019-12-05 17:54:24.000000000 +0100 @@ -15,4 +15,4 @@ h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { visibility: visible; } - </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.1</span><hr><div class="refentry"><a name="health-checker.index"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>health-checker.index — List all manpages from the health-checker project</p></div><div class="refsect1"><a name="id-1.4"></a><h2 id="H">H<a class="headerlink" title="Permalink to this headline" href="#H">¶</a></h2><p><a href="health-checker.8.html"><span class="citerefentry"><span class="refentrytitle">health-checker</span>(8)</span></a> -- Checks that all important services of a system did come up correctly after an update and reboot.<br><a href="health-checker.service.8.html"><span class="citerefentry"><span class="refentrytitle">health-checker.service</span>(8)</span></a> -- Checks that all important services of a system did come up correctly after an update and reboot.<br></p></div><div class="refsect1"><a name="id-1.5"></a><p><a name="counts"></a>This index contains 2 entries, referring to 1 individual manual pages.</p></div></div></body></html> + </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.2.3</span><hr><div class="refentry"><a name="health-checker.index"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>health-checker.index — List all manpages from the health-checker project</p></div><div class="refsect1"><a name="id-1.4"></a><h2 id="H">H<a class="headerlink" title="Permalink to this headline" href="#H">¶</a></h2><p><a href="health-checker.8.html"><span class="citerefentry"><span class="refentrytitle">health-checker</span>(8)</span></a> -- Checks that all important services of a system did come up correctly after an update and reboot.<br><a href="health-checker.service.8.html"><span class="citerefentry"><span class="refentrytitle">health-checker.service</span>(8)</span></a> -- Checks that all important services of a system did come up correctly after an update and reboot.<br></p></div><div class="refsect1"><a name="id-1.5"></a><p><a name="counts"></a>This index contains 2 entries, referring to 1 individual manual pages.</p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/man/health-checker.service.8.html new/health-checker-1.3/man/health-checker.service.8.html --- old/health-checker-1.2.3/man/health-checker.service.8.html 2019-02-25 21:36:27.000000000 +0100 +++ new/health-checker-1.3/man/health-checker.service.8.html 2019-12-05 17:52:48.000000000 +0100 @@ -15,7 +15,7 @@ h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink { visibility: visible; } - </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.1</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up + </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.2.3</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up correctly after an update and reboot.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> --version </p></div><p><code class="filename">health-checker.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>health-checker</em></span> checks during boot, if the system is coming up correct. In error case, the action depends on what did happen before. If this is the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/missing new/health-checker-1.3/missing --- old/health-checker-1.2.3/missing 2019-02-25 16:20:45.000000000 +0100 +++ new/health-checker-1.3/missing 2019-12-05 17:52:41.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/plugins/Makefile.in new/health-checker-1.3/plugins/Makefile.in --- old/health-checker-1.2.3/plugins/Makefile.in 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/plugins/Makefile.in 2020-01-14 16:48:30.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -258,8 +258,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -312,7 +312,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/sbin/Makefile.in new/health-checker-1.3/sbin/Makefile.in --- old/health-checker-1.2.3/sbin/Makefile.in 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/sbin/Makefile.in 2020-01-14 16:48:30.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -255,8 +255,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -311,7 +311,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/sbin/health-checker.in new/health-checker-1.3/sbin/health-checker.in --- old/health-checker-1.2.3/sbin/health-checker.in 2019-03-13 13:27:27.000000000 +0100 +++ new/health-checker-1.3/sbin/health-checker.in 2020-01-14 16:48:00.000000000 +0100 @@ -16,11 +16,13 @@ TELEM_SEVERITY=1 TELEM_PAYLOAD="" -BTRFS_ID=0 +BTRFS_ID_DEFAULT=0 +BTRFS_ID_CURRENT=0 set_btrfs_id() { - BTRFS_ID=`btrfs subvolume get-default / | awk '{print $2}'` + BTRFS_ID_DEFAULT=`btrfs subvolume get-default / | awk '{print $2}'` + BTRFS_ID_CURRENT=`findmnt --output OPTIONS --noheadings / | sed -e 's|.*subvolid=\([0-9]\+\).*|\1|g'` } create_log() @@ -70,7 +72,9 @@ { set_btrfs_id - echo "LAST_WORKING_BTRFS_ID=${BTRFS_ID}" > $STATE_FILE + if [ ${BTRFS_ID_DEFAULT} -eq ${BTRFS_ID_CURRENT} ]; then + echo "LAST_WORKING_BTRFS_ID=${BTRFS_ID_DEFAULT}" > $STATE_FILE + fi } rollback() @@ -78,7 +82,7 @@ . ${STATE_FILE} btrfs subvolume set-default ${LAST_WORKING_BTRFS_ID} /.snapshots if [ $? -ne 0 ]; then - create_log user.crit "ERROR: btrfs set-default $BTRFS_ID failed!" + create_log user.crit "ERROR: btrfs set-default $BTRFS_ID_DEFAULT failed!" telem_send_playload 1 exit 1 fi @@ -105,7 +109,11 @@ set_btrfs_id - if [ ${LAST_WORKING_BTRFS_ID} -ne ${BTRFS_ID} ]; then + 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" + 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" rollback if [ $? -eq 0 ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.2.3/systemd/Makefile.in new/health-checker-1.3/systemd/Makefile.in --- old/health-checker-1.2.3/systemd/Makefile.in 2019-05-06 15:56:16.000000000 +0200 +++ new/health-checker-1.3/systemd/Makefile.in 2020-01-14 16:48:30.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -256,8 +256,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -296,7 +296,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \
