Skip to content

PR than contains the fixes for the issues I have opened #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
solsticedhiver wants to merge 3 commits into
base: master
Choose a base branch
from
Open

PR than contains the fixes for the issues I have opened #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a73c4ea
Fix alpm hooks because of new linux package layout
solsticedhiver Jan 14, 2020
00cbcb9
Fix zenity weird height (and width)
solsticedhiver Jan 14, 2020
9f3c16e
Add loader/random-seed to excluded file list
solsticedhiver Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chkboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions notification/chkboot-desktopalert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions pacman-hooks/80-chkboot-check.hook
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 5 additions & 2 deletions pacman-hooks/99-chkboot-update.hook
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down