DragonFly BSD
DragonFly submit List (threaded) for 2006-06
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Remove hardcoded values from /etc/rc.d/ldconfig


From: Andreas Hauser <andy@xxxxxxxxxxxxxxx>
Date: 18 Jun 2006 23:16:35 +0200

Hoi,

Remove hardcoded values from /etc/rc.d/ldconfig.

-- 
Andy


diff -r c9c78dabd0ad etc/defaults/rc.conf
--- a/etc/defaults/rc.conf	Thu Jun 08 18:48:30 2006 +0000
+++ b/etc/defaults/rc.conf	Sun Jun 18 11:36:45 2006 +0200
@@ -410,7 +410,7 @@ osf1_enable="NO"	# Alpha OSF/1 emulation
 osf1_enable="NO"	# Alpha OSF/1 emulation loaded at startup (or NO).
 clear_tmp_enable="NO"	# Clear /tmp at startup.
 ldconfig_insecure="NO"	# Set to YES to disable ldconfig security checks
-ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib"
+ldconfig_paths="/usr/lib /usr/lib/gcc* /usr/lib/compat /usr/X11R6/lib /usr/local/lib"
 			# shared library search paths
 ldconfig_paths_aout="/usr/lib/compat/aout /usr/X11R6/lib/aout /usr/local/lib/aout"
 			# a.out shared library search paths
diff -r c9c78dabd0ad etc/rc.d/ldconfig
--- a/etc/rc.d/ldconfig	Thu Jun 08 18:48:30 2006 +0000
+++ b/etc/rc.d/ldconfig	Sun Jun 18 11:36:45 2006 +0200
@@ -22,7 +22,7 @@ ldconfig_start()
 		ldconfig=${ldconfig_command}
 		checkyesno ldconfig_insecure && _ins="-i"
 		if [ -x "${ldconfig_command}" ]; then
-			_LDC="/usr/lib /usr/lib/gcc*"
+			_LDC=""
 			for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
 				if [ -r "${i}" ]; then
 					_LDC="${_LDC} ${i}"



[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]