diff options
| author | Jonathan Bauer | 2014-07-25 15:56:48 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-07-25 15:56:48 +0200 |
| commit | b063cb9e530760acdfc16819fd1d21ab797666bb (patch) | |
| tree | fa75dd8a01d7e8ed72e081454861d5a816d305e5 /remote/includes | |
| parent | [rfs-s31] fix copying of the busybox (diff) | |
| parent | [pvs2 + x11vnc] Add conf files for fedora (diff) | |
| download | tm-scripts-b063cb9e530760acdfc16819fd1d21ab797666bb.tar.gz tm-scripts-b063cb9e530760acdfc16819fd1d21ab797666bb.tar.xz tm-scripts-b063cb9e530760acdfc16819fd1d21ab797666bb.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/includes')
| -rw-r--r-- | remote/includes/paths.inc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/remote/includes/paths.inc b/remote/includes/paths.inc index 8ab016df..ca692adb 100644 --- a/remote/includes/paths.inc +++ b/remote/includes/paths.inc @@ -11,3 +11,22 @@ for CANDIDATE in $(strings "$(ldd "$(which login)" | grep libpam.so | head -n 1 done [ -z "$SYS_PAM_MODULES_PATH" ] && perror "Failed to find pam_unix.so on this system." + +# +# Figure out if we have split usr +if [ -L "/bin" -a -L "/lib" ]; then + declare -rg USR_SPLIT="no" +else + declare -rg USR_SPLIT="yes" +fi +pdebug "/bin and /lib are split from /usr/bin and /usr/lib (they are not symlinks): $USR_SPLIT" + +SYS_LIB_PATHS="" +for DIR in /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64; do + [ -d "$DIR" -a ! -L "$DIR" ] && SYS_LIB_PATHS+=" $DIR" +done +declare -rg SYS_LIB_PATHS=$SYS_LIB_PATHS +pdebug "System lib paths: $SYS_LIB_PATHS" + +true + |