From 0c8fbb70adb420748c566f7abc54d2cc9f3db854 Mon Sep 17 00:00:00 2001
From: Drew Moseley <drew.moseley@northern.tech>
Date: Sun, 16 Aug 2020 13:00:19 -0400
Subject: [PATCH] Cleanup more bootloader files.

In particular these are present in systemd-boot systems built with
mkosi.

Changelog: Title
Signed-off-by: Drew Moseley <drew.moseley@northern.tech>
---
 mender-convert-modify | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mender-convert-modify b/mender-convert-modify
index cebd93a..7d8c2d5 100755
--- a/mender-convert-modify
+++ b/mender-convert-modify
@@ -169,10 +169,14 @@ EOF
   # functionality, but lets get rid of them to avoid confusion.
   #
   # There is no Mender integration for EFI boot or systemd-boot.
-  sudo rm -rf work/boot/loader
+  sudo rm -rf work/boot/loader work/rootfs/boot/loader
   sudo rm -rf work/boot/EFI/Linux
   sudo rm -rf work/boot/EFI/systemd
   sudo rm -rf work/boot/NvVars
+  for empty_dir in $(cd work/boot; find . -maxdepth 1 -type d -empty); do
+      sudo rmdir work/boot/$empty_dir
+      sudo rm work/rootfs/boot/$empty_dir
+  done
 
   log_info "Installing GRUB"