From 08ee8a83a49a6da3d6ddc63056535777cf36d4bc Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 12 Aug 2019 16:46:01 +0200
Subject: [slx-addons] glob whiteout file names

---
 builder/modules.d/slx-addons/scripts/setup-addons.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'builder')

diff --git a/builder/modules.d/slx-addons/scripts/setup-addons.sh b/builder/modules.d/slx-addons/scripts/setup-addons.sh
index b403b13c..9fe3b06f 100644
--- a/builder/modules.d/slx-addons/scripts/setup-addons.sh
+++ b/builder/modules.d/slx-addons/scripts/setup-addons.sh
@@ -71,11 +71,11 @@ setup_addon() {
 	done
 
 	# post merge: remove whiteouts from filesystem
-	local WHITEOUTS="$NEWROOT/opt/openslx/etc/${ADDON}.whiteout"
+	local WHITEOUTS="$NEWROOT/opt/openslx/etc/"*".whiteout"
 	if [ -e "$WHITEOUTS" ]; then
 		while read line; do
-			rm "${NEWROOT}/${line}"
-		done < "$WHITEOUTS"
+			rm -f "${NEWROOT}/${line}"
+		done < <(cat ${WHITEOUTS[@]})
 	fi
 
 	# finally update ld.so.cache expected to be under /opt/openslx/etc/<addon_name>.ld.so.cache
@@ -99,7 +99,7 @@ setup_addon() {
 				return 0
 			fi
 		done
-		# very bad indeed, libraries won't be register in the cache ...
+		# very bad indeed, libraries won't be registered in the cache ...
 		warn "Failed to find 'ldconfig' to rebuild the addon's missing ld.so.cache..."
 		return 1
 	fi
-- 
cgit v1.2.3-55-g7522