From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Fri, 29 Nov 2024 23:19:25 +0000 (+0000)
Subject: kernel-install: remove .extra.d/ directory too
X-Git-Tag: v257~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0747e3b60eb4496ee122066c844210ce818d76d9;p=thirdparty%2Fsystemd.git

kernel-install: remove .extra.d/ directory too

When a UKI is removed, the per-UKI .extra.d/ directory (addons,
extensions, etc) is left behind.
---

diff --git a/src/kernel-install/90-uki-copy.install b/src/kernel-install/90-uki-copy.install
index d6f71349cb9..04bf5d1752f 100755
--- a/src/kernel-install/90-uki-copy.install
+++ b/src/kernel-install/90-uki-copy.install
@@ -34,9 +34,10 @@ UKI_DIR="$BOOT_ROOT/EFI/Linux"
 case "$COMMAND" in
     remove)
         [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
-            echo "Removing $UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION*.efi"
-        exec rm -f \
+            echo "Removing $UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION*.efi and extras"
+        exec rm -rf \
             "$UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION.efi" \
+            "$UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION.efi.extra.d/" \
             "$UKI_DIR/$ENTRY_TOKEN-$KERNEL_VERSION+"*".efi"
         ;;
     add)