From 35400113813c6b3030828fb82a08d07f465968ca Mon Sep 17 00:00:00 2001
From: Mirza Krak <mirza.krak@northern.tech>
Date: Mon, 14 Dec 2020 08:58:32 +0000
Subject: [PATCH] mender-convert-modify: remove superfluous 'rm' in empty dir
 cleanup

The 'rmdir' call should be enough, and just because there is an
empty dir in the boot part, does not mean that it exists in
rootfs/boot, so just remove this.

Changelog: Fix error when removing empty directories in rootfs/boot

Signed-off-by: Mirza Krak <mirza.krak@northern.tech>
(cherry picked from commit 17b92ddfe0c8b7621f262e8ea3aa84e7cb006327)
---
 mender-convert-modify | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mender-convert-modify b/mender-convert-modify
index f644b86..6d0a88d 100755
--- a/mender-convert-modify
+++ b/mender-convert-modify
@@ -184,7 +184,6 @@ EOF
   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"