diff options
author | flz <flz@FreeBSD.org> | 2006-06-21 10:22:44 +0000 |
---|---|---|
committer | flz <flz@FreeBSD.org> | 2006-06-21 10:22:44 +0000 |
commit | 53217b55bf71cac835a320174772e4d7b73dcabf (patch) | |
tree | 765871df193784a87b08b9597db79c78ef2496e6 /etc | |
parent | 39e51502f78eb5ebde38394762302ac140665fe2 (diff) | |
download | FreeBSD-src-53217b55bf71cac835a320174772e4d7b73dcabf.zip FreeBSD-src-53217b55bf71cac835a320174772e4d7b73dcabf.tar.gz |
Since INSTALLS_SHLIB has been superseded by USE_LDCONFIG in bsd.port.mk, I
expect to see quite a few files appearing in libdata/ldconfig directories.
This change avoids the screen to be filled with the names of those ldconfig
files and replace them by the actual non-default directories they contain.
Most of them will be ${PREFIX}/lib so, 'sort -u' will help reducing the
output.
Approved by: cperciva (implicit)
MFC after: 1 week
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.d/ldconfig | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig index 60a61e1..b59a2d9 100755 --- a/etc/rc.d/ldconfig +++ b/etc/rc.d/ldconfig @@ -17,6 +17,8 @@ stop_cmd=":" ldconfig_start() { + local _files + _ins= ldconfig=${ldconfig_command} checkyesno ldconfig_insecure && _ins="-i" @@ -24,7 +26,10 @@ ldconfig_start() _LDC="/lib /usr/lib" for i in ${ldconfig_local_dirs}; do if [ -d "${i}" ]; then - ldconfig_paths="${ldconfig_paths} `find ${i} -type f`" + _files=`find ${i} -type f` + if [ -n "${_files}" ]; then + ldconfig_paths="${ldconfig_paths} `cat ${_files} | sort -u`" + fi fi done for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do @@ -39,7 +44,10 @@ ldconfig_start() amd64) for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then - ldconfig32_paths="${ldconfig32_paths} `find ${i} -type f`" + _files=`find ${i} -type f` + if [ -n "${_files}" ]; then + ldconfig32_paths="${ldconfig32_paths} `cat ${_files} | sort -u`" + fi fi done echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths} |