From a73c4ead24708c52a5a98424812f4a4b2258cb2f Mon Sep 17 00:00:00 2001 From: solsTiCe d'Hiver Date: Tue, 14 Jan 2020 10:35:01 +0100 Subject: [PATCH 1/3] Fix alpm hooks because of new linux package layout * Fix for #26 --- pacman-hooks/80-chkboot-check.hook | 7 +++++-- pacman-hooks/99-chkboot-update.hook | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pacman-hooks/80-chkboot-check.hook b/pacman-hooks/80-chkboot-check.hook index 2a036b5..b61c54a 100644 --- a/pacman-hooks/80-chkboot-check.hook +++ b/pacman-hooks/80-chkboot-check.hook @@ -1,9 +1,12 @@ [Trigger] -Type = File +Type = Package Operation = Install Operation = Upgrade Operation = Remove -Target = boot/* +Target = linux* +Target = mkinitcpio* +Target = grub* +Target = systemd [Action] Depends = chkboot diff --git a/pacman-hooks/99-chkboot-update.hook b/pacman-hooks/99-chkboot-update.hook index ef1edc6..34d8554 100644 --- a/pacman-hooks/99-chkboot-update.hook +++ b/pacman-hooks/99-chkboot-update.hook @@ -1,9 +1,12 @@ [Trigger] -Type = File +Type = Package Operation = Install Operation = Upgrade Operation = Remove -Target = boot/* +Target = linux* +Target = mkinitcpio* +Target = grub* +Target = systemd [Action] Depends = chkboot From 00cbcb9228d40c6a9acfc801cc35aac0a11bc62f Mon Sep 17 00:00:00 2001 From: solsTiCe d'Hiver Date: Tue, 14 Jan 2020 10:37:41 +0100 Subject: [PATCH 2/3] Fix zenity weird height (and width) * fixes issue #25 --- notification/chkboot-desktopalert | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/notification/chkboot-desktopalert b/notification/chkboot-desktopalert index 0991200..694ac77 100755 --- a/notification/chkboot-desktopalert +++ b/notification/chkboot-desktopalert @@ -11,12 +11,12 @@ chgfile=${CHKBOOT_DATA}/${CHANGES_ALERT} XMESSAGE=/usr/bin/xmessage ZENITY=/usr/bin/zenity -NOTIFICATION="This notification will continue to appear until you either run chkboot again as root or restart your computer" +NOTIFICATION="This notification will continue to appear until you\n- either run chkboot again as root\n- or restart your computer" if [ -s $chgfile ]; then if [ -x $ZENITY ]; then - cat $chgfile | $ZENITY --title "ALERT: Boot changes" --text-info --width 550 --height 300 - $ZENITY --title "chkboot" --info --text="$NOTIFICATION" + cat $chgfile | $ZENITY --title "ALERT: Boot changes" --text-info --width 640 --height 480 --no-wrap + $ZENITY --title "chkboot" --info --height=100 --width=100 --no-wrap --text="$NOTIFICATION" elif [ -x $XMESSAGE ]; then cat $chgfile | $XMESSAGE -default okay -file - $XMESSAGE -default okay $NOTIFICATION From 9f3c16e88778ff2d2ab7b936fdb71ca5aea8a046 Mon Sep 17 00:00:00 2001 From: solsTiCe d'Hiver Date: Tue, 14 Jan 2020 10:39:13 +0100 Subject: [PATCH 3/3] Add loader/random-seed to excluded file list * fixes issue #24 --- chkboot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chkboot b/chkboot index dbcdea2..9b19e7b 100755 --- a/chkboot +++ b/chkboot @@ -68,7 +68,7 @@ dd if="$BOOTDISK" of="$DISKHEAD" bs=512 count=1 > /dev/null 2>&1 pushd "$BOOTDIR" > /dev/null 2>&1 files=`find . -type f` # get file infos - files=`echo $files | sed "s/.\/grub\/grubenv//"` # remove files that should be skipped + files=`echo $files | sed -e "s/.\/grub\/grubenv//" -e "s/\.\/loader\/random-seed//"` # remove files that should be skipped # generate hashes of each file for fname in $files; do