summaryrefslogtreecommitdiffstats
path: root/remote/setup_target
diff options
context:
space:
mode:
authorJonathan Bauer2013-06-14 17:05:04 +0200
committerJonathan Bauer2013-06-14 17:05:04 +0200
commit90403a880c10650c44222a41245fe2d5b405b655 (patch)
treeb826465a00b5bf6857c44b51b1ab2030c99c9914 /remote/setup_target
parent[systemd] enable pam support (fixes pam_systemd.so missing) (diff)
parentldconfig: Include system's default paths (diff)
downloadtm-scripts-90403a880c10650c44222a41245fe2d5b405b655.tar.gz
tm-scripts-90403a880c10650c44222a41245fe2d5b405b655.tar.xz
tm-scripts-90403a880c10650c44222a41245fe2d5b405b655.zip
Merge branch 'master' of git:openslx-ng/tm-scripts
Diffstat (limited to 'remote/setup_target')
-rwxr-xr-xremote/setup_target7
1 files changed, 6 insertions, 1 deletions
diff --git a/remote/setup_target b/remote/setup_target
index b0565550..54ed0cb0 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -314,7 +314,12 @@ post_process_target() {
rm -r "${TARGET_BUILD_DIR}/lib/systemd"
fi
- ldconfig -r "${TARGET_BUILD_DIR}"
+ # figure out all relevant ld-paths
+ local LDTEMP="$TARGET_BUILD_DIR/ldconf-temp"
+ grep -h '^\s*/' /etc/ld.so.conf /etc/ld.so.conf.d/* > "$LDTEMP"
+ # TODO: Echo other stuff to $LDTEMP (but figure out if first or last match wins)
+ ldconfig -v -r "${TARGET_BUILD_DIR}" -f "/ldconf-temp"
+ unlink "$LDTEMP"
}