automatically link running kernel's modules after kernel upgrade

6 files changed, 36 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e142dde69b11..09f2913e68ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
 pkgbase = linux-preserve-modules
 	pkgdesc = a pacman hook that preserves linux kernel modules until reboot
-	pkgver = 1.4.1
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = https://aur.archlinux.org/packages/linux-preserve-modules
 	arch = any
 	license = MIT
-	source = linux-preserve-modules.hook
-	source = linux-preserve-modules.script
+	source = linux-preserve-modules-pre.hook
+	source = linux-preserve-modules-pre.script
+	source = linux-preserve-modules-post.hook
+	source = linux-preserve-modules-post.script
 	source = linux-preserve-modules
-	sha256sums = 666c8f92f798a006b83740afae4dc832e4d38209eb866b2019cb32b8798bfdbf
+	sha256sums = 167af37f4393b28c9b3bc3ad271d8bcfc37e2d5e5e77ee4e42b0db945543636e
 	sha256sums = 445bb6acf68dbb64f4b2651b3d2a39e607ebbc7e87faa078dea7880f8b2a6302
+	sha256sums = 1b869cce14596206f5046091678a8dc53dca61a82906622aeb192eaa20e262a1
+	sha256sums = efa8117ba4e8306901449914c7dfe5b7a93b7ef994f9d121c1f3d2e484735a5b
 	sha256sums = bbaacbb5171931770bb4d202519db4b73d66f6b35a51008592ca2454badb647d
 
 pkgname = linux-preserve-modules
diff --git a/PKGBUILD b/PKGBUILD
index ca37b7805c57..296c512fe9d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,28 @@
 # Maintainer: Ferdinand B <theferdi265@gmail.com>
 
 pkgname=linux-preserve-modules
-pkgver=1.4.1
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="a pacman hook that preserves linux kernel modules until reboot"
 url="https://aur.archlinux.org/packages/linux-preserve-modules"
 arch=('any')
 license=('MIT')
 depends=()
-source=(linux-preserve-modules.hook
-        linux-preserve-modules.script
+source=(linux-preserve-modules-pre.hook
+        linux-preserve-modules-pre.script
+        linux-preserve-modules-post.hook
+        linux-preserve-modules-post.script
         linux-preserve-modules)
-sha256sums=('666c8f92f798a006b83740afae4dc832e4d38209eb866b2019cb32b8798bfdbf'
+sha256sums=('167af37f4393b28c9b3bc3ad271d8bcfc37e2d5e5e77ee4e42b0db945543636e'
             '445bb6acf68dbb64f4b2651b3d2a39e607ebbc7e87faa078dea7880f8b2a6302'
+            '1b869cce14596206f5046091678a8dc53dca61a82906622aeb192eaa20e262a1'
+            'efa8117ba4e8306901449914c7dfe5b7a93b7ef994f9d121c1f3d2e484735a5b'
             'bbaacbb5171931770bb4d202519db4b73d66f6b35a51008592ca2454badb647d')
 
 package() {
-    install -Dm644 "$srcdir/linux-preserve-modules.hook" "$pkgdir/usr/share/libalpm/hooks/10-linux-preserve-modules.hook"
-    install -Dm755 "$srcdir/linux-preserve-modules.script" "$pkgdir/usr/share/libalpm/scripts/linux-preserve-modules"
+    install -Dm644 "$srcdir/linux-preserve-modules-pre.hook" "$pkgdir/usr/share/libalpm/hooks/10-linux-preserve-modules-pre.hook"
+    install -Dm755 "$srcdir/linux-preserve-modules-pre.script" "$pkgdir/usr/share/libalpm/scripts/linux-preserve-modules-pre"
+    install -Dm644 "$srcdir/linux-preserve-modules-post.hook" "$pkgdir/usr/share/libalpm/hooks/10-linux-preserve-modules-post.hook"
+    install -Dm755 "$srcdir/linux-preserve-modules-post.script" "$pkgdir/usr/share/libalpm/scripts/linux-preserve-modules-post"
     install -Dm755 "$srcdir/linux-preserve-modules" "$pkgdir/usr/bin/linux-preserve-modules"
 }
diff --git a/linux-preserve-modules-post.hook b/linux-preserve-modules-post.hook
new file mode 100644
index 000000000000..c16f219580a6
--- /dev/null
+++ b/linux-preserve-modules-post.hook
@@ -0,0 +1,12 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/modules/*/
+Target = !usr/lib/modules/*/?*
+
+[Action]
+Description = Linking old linux kernel modules...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/linux-preserve-modules-post
diff --git a/linux-preserve-modules-post.script b/linux-preserve-modules-post.script
new file mode 100755
index 000000000000..e1afefa8a30f
--- /dev/null
+++ b/linux-preserve-modules-post.script
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+linux-preserve-modules link
diff --git a/linux-preserve-modules.hook b/linux-preserve-modules-pre.hook
index e60955a167b0..a3b730fb12f4 100644
--- a/linux-preserve-modules.hook
+++ b/linux-preserve-modules-pre.hook
@@ -9,5 +9,5 @@ Target = !usr/lib/modules/*/?*
 [Action]
 Description = Preserving old linux kernel modules...
 When = PreTransaction
-Exec = /usr/share/libalpm/scripts/linux-preserve-modules
+Exec = /usr/share/libalpm/scripts/linux-preserve-modules-pre
 NeedsTargets
diff --git a/linux-preserve-modules.script b/linux-preserve-modules-pre.script
index 77d5f92204fe..77d5f92204fe 100755
--- a/linux-preserve-modules.script
+++ b/linux-preserve-modules-pre.script