From 61c4b950c5ac8e405125d865ae7ef67b0f77246a Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 13 Dec 2019 16:55:17 +0100
Subject: [slx-addons] properly use addon's ld.so.cache

if it was the only one activated
---
 builder/modules.d/slx-addons/scripts/setup-addons.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/builder/modules.d/slx-addons/scripts/setup-addons.sh b/builder/modules.d/slx-addons/scripts/setup-addons.sh
index 8232a9c7..c155a5a5 100644
--- a/builder/modules.d/slx-addons/scripts/setup-addons.sh
+++ b/builder/modules.d/slx-addons/scripts/setup-addons.sh
@@ -80,7 +80,7 @@ setup_addon() {
 active=()
 for addon in "${NEWROOT}/opt/openslx/addons/"*; do
 	if setup_addon "$addon"; then
-		active+=("$addon")
+		active+=("${addon#${NEWROOT}/opt/openslx/addons/}")
 		info "Activated '$addon' (@ $(date +%s))"
 	fi
 done
@@ -93,7 +93,6 @@ if [ "${#active[@]}" -eq 1 ]; then
 		info "Using ld.so.cache of '${active[0]}'."
 		mv -f -- "${NEWROOT}/etc/ld.so.cache"{,.stage4}
 		mv -f -- "$addon_cache" "${NEWROOT}/etc/ld.so.cache"
-		exit 0
 	fi
 elif [ "${#active[@]}" -gt 1 ]; then
 	info "Activating ldconfig in stage4 due to multiple loaded addons: ${active[@]}"
-- 
cgit v1.2.3-55-g7522