From 85eb991993e538343bd57ba5587a56fe4d23700e Mon Sep 17 00:00:00 2001
From: dalto <dalto@fastmail.com>
Date: Sun, 1 Oct 2023 10:37:30 -0500
Subject: [PATCH] Fix non-kernel triggers

---
 src/usr/share/libalpm/hooks/90-kernel-install.hook |  8 +++++++-
 src/usr/share/libalpm/scripts/kernel-install       | 14 +++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/usr/share/libalpm/hooks/90-kernel-install.hook b/src/usr/share/libalpm/hooks/90-kernel-install.hook
index 9f895d1..a7b3de4 100644
--- a/src/usr/share/libalpm/hooks/90-kernel-install.hook
+++ b/src/usr/share/libalpm/hooks/90-kernel-install.hook
@@ -2,7 +2,7 @@
 Type = Path
 Operation = Install
 Operation = Upgrade
-Target = usr/lib/modules/*/vmlinuz
+Operation = Remove
 Target = usr/lib/initcpio/*
 Target = usr/lib/firmware/*
 Target = usr/src/*/dkms.conf
@@ -15,6 +15,12 @@ Operation = Remove
 Target = amd-ucode
 Target = intel-ucode
 
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/modules/*/vmlinuz
+
 [Action]
 Description = Installing kernel...
 When = PostTransaction
diff --git a/src/usr/share/libalpm/scripts/kernel-install b/src/usr/share/libalpm/scripts/kernel-install
index 39ef3af..92c7801 100755
--- a/src/usr/share/libalpm/scripts/kernel-install
+++ b/src/usr/share/libalpm/scripts/kernel-install
@@ -6,14 +6,22 @@ while read -r line; do
         echo ":: kernel-install removing kernel $version"
         kernel-install remove "${version}"
     elif [[ $1 == "add" ]]; then
-        echo ":: kernel-install installing kernel $version"
-        kernel-install add "${version}" "${line}"
+        if [[ line =~ ".*vmlinuz$" ]]; then
+            echo ":: kernel-install installing kernel $version"
+            kernel-install add "${version}" "${line}"
+        else
+            install_all=1
+            break
+        fi
     else
         echo ":: Invalid option passed to kernel-install script"
     fi
-    version=$(basename "${line%/vmlinuz}")
 done
 
+if [[ $install_all == 1 ]]; then
+    reinstall-kernels
+fi
+
 # first check if we are running in a chroot
 if [ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ]; then
     echo 'Running in a chroot, skipping cmdline generation'