diff options
| author | Mike Makonnen <mtm@FreeBSD.org> | 2003-05-18 03:39:39 +0000 |
|---|---|---|
| committer | Mike Makonnen <mtm@FreeBSD.org> | 2003-05-18 03:39:39 +0000 |
| commit | 6aeefcde4be7b8c8674d171af067d9ff24768506 (patch) | |
| tree | 8bebae3c288f2d7a8365de53fb2fb9c5bad80477 | |
| parent | 66d67af4b46639d8b9c01f53f0d98e788929594a (diff) | |
| download | src-6aeefcde4be7b8c8674d171af067d9ff24768506.tar.gz src-6aeefcde4be7b8c8674d171af067d9ff24768506.zip | |
Apparently ldconfig(8) prefers the format as the first argument
with the rest of the options following it. This caused problems for
people using ldconfig_insecure=yes because the '-i' switch was being
positioned before the format argument.
Approved by: markm/mentor (implicit), re/rwatson
PR: 47430
Notes
Notes:
svn path=/head/; revision=115124
| -rwxr-xr-x | etc/rc.d/ldconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig index 3086cf904f00..37e600db7dc8 100755 --- a/etc/rc.d/ldconfig +++ b/etc/rc.d/ldconfig @@ -20,8 +20,9 @@ ldconfig_start() { case ${OSTYPE} in FreeBSD) + _ins= ldconfig=${ldconfig_command} - checkyesno ldconfig_insecure && ldconfig="${ldconfig} -i" + checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then _LDC=/usr/lib for i in ${ldconfig_paths}; do @@ -30,7 +31,7 @@ ldconfig_start() fi done echo 'ELF ldconfig path:' ${_LDC} - ${ldconfig} -elf ${_LDC} + ${ldconfig} -elf ${_ins} ${_LDC} # Legacy aout support for i386 only case `sysctl -n hw.machine_arch` in @@ -44,7 +45,7 @@ ldconfig_start() fi done echo 'a.out ldconfig path:' ${_LDC} - ${ldconfig} -aout ${_LDC} + ${ldconfig} -aout ${_ins} ${_LDC} ;; esac fi |