From ccb0d434079066433da71a6924fe89c801212acb Mon Sep 17 00:00:00 2001
From: mtm <mtm@FreeBSD.org>
Date: Sun, 18 May 2003 03:39:39 +0000
Subject: 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
---
 etc/rc.d/ldconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index 3086cf9..37e600d 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
-- 
cgit v1.1