Merge pull request #209 from leomeinel/temp

Merge main from temp
leomeinel · Apr 29, 2023 · 2626312 · 2626312
2 parents 58e6c29 + 80b8388
commit 2626312
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 149 deletions.
diff --git a/etc/pacman.d/hooks/50-log-orphans.hook b/etc/pacman.d/hooks/50-log-orphans.hook
@@ -1,7 +1,7 @@
 [Trigger]
 Operation = Install
-Operation = Remove
 Operation = Upgrade
+Operation = Remove
 Type = Package
 Target = *
 

diff --git a/etc/pacman.d/hooks/50-pkglists.hook → etc/pacman.d/hooks/51-pkglists.hook b/etc/pacman.d/hooks/50-pkglists.hook → etc/pacman.d/hooks/51-pkglists.hook
diff --git a/etc/pacman.d/hooks/60-dracut-uefi-remove.hook b/etc/pacman.d/hooks/60-dracut-uefi-remove.hook
@@ -0,0 +1,13 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/modules/*/pkgbase
+Target = usr/src/*/dkms.conf
+
+[Action]
+Description = Removing unified EFI kernel images...
+When = PreTransaction
+Exec = /bin/sh -c '/etc/pacman.d/hooks/scripts/60-dracut-uefi-remove.sh'
+NeedsTargets
diff --git a/etc/pacman.d/hooks/90-dracut-uefi-install.hook b/etc/pacman.d/hooks/90-dracut-uefi-install.hook
@@ -0,0 +1,16 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/modules/*/pkgbase
+Target = usr/src/*/dkms.conf
+Target = usr/lib/dracut/*
+Target = usr/lib/systemd/systemd
+Target = usr/lib/systemd/boot/efi/*.efi.stub
+
+[Action]
+Description = Generating unified EFI kernel images...
+When = PostTransaction
+Exec = /bin/sh -c '/etc/pacman.d/hooks/scripts/90-dracut-uefi-install.sh'
+NeedsTargets
diff --git a/etc/pacman.d/hooks/91-dracut-uefi-install b/etc/pacman.d/hooks/91-dracut-uefi-install
diff --git a/etc/pacman.d/hooks/92-dracut-uefi-remove b/etc/pacman.d/hooks/92-dracut-uefi-remove
diff --git a/etc/pacman.d/hooks/96-systemd-boot-sign.hook b/etc/pacman.d/hooks/96-systemd-boot-sign.hook
@@ -1,6 +1,7 @@
 [Trigger]
 Operation = Install
 Operation = Upgrade
+Operation = Remove
 Type = Package
 Target = linux
 Target = linux-lts

diff --git a/etc/pacman.d/hooks/scripts/60-dracut-uefi-remove.sh b/etc/pacman.d/hooks/scripts/60-dracut-uefi-remove.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+###
+# File: 60-dracut-uefi-remove.sh
+# Author: Leopold Meinel (leo@meinel.dev)
+# -----
+# Copyright (c) 2023 Leopold Meinel & contributors
+# SPDX ID: GPL-3.0-or-later
+# URL: https://www.gnu.org/licenses/gpl-3.0-standalone.html
+# -----
+###
+
+set -e
+if /usr/bin/mountpoint -q /efi; then
+    /usr/bin/umount -AR /efi
+fi
+/usr/bin/mount /efi
+shopt -s nocaseglob
+/usr/bin/rm -f /efi/EFI/Linux/*.efi
diff --git a/etc/pacman.d/hooks/scripts/90-dracut-uefi-install.sh b/etc/pacman.d/hooks/scripts/90-dracut-uefi-install.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+###
+# File: 90-dracut-uefi-install.sh
+# Author: Leopold Meinel (leo@meinel.dev)
+# -----
+# Copyright (c) 2023 Leopold Meinel & contributors
+# SPDX ID: GPL-3.0-or-later
+# URL: https://www.gnu.org/licenses/gpl-3.0-standalone.html
+# -----
+###
+
+set -e
+if /usr/bin/mountpoint -q /efi; then
+    /usr/bin/umount -AR /efi
+fi
+/usr/bin/mount /efi
+/usr/bin/dracut --regenerate-all -fq
diff --git a/etc/pacman.d/hooks/scripts/91-dracut-uefi.sh b/etc/pacman.d/hooks/scripts/91-dracut-uefi.sh