summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2019-12-13 16:55:17 +0100
committerJonathan Bauer2019-12-13 16:55:17 +0100
commit61c4b950c5ac8e405125d865ae7ef67b0f77246a (patch)
treedc167c87fd6012bbf9b041babe8cf33466fd64da
parent[slx-network] retry dhcp faster in stage4 (diff)
downloadsystemd-init-61c4b950c5ac8e405125d865ae7ef67b0f77246a.tar.gz
systemd-init-61c4b950c5ac8e405125d865ae7ef67b0f77246a.tar.xz
systemd-init-61c4b950c5ac8e405125d865ae7ef67b0f77246a.zip
[slx-addons] properly use addon's ld.so.cache
if it was the only one activated
-rw-r--r--builder/modules.d/slx-addons/scripts/setup-addons.sh3
1 files changed, 1 insertions, 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[@]}"