head	1.24;
access;
symbols
	RELENG_8_4:1.24.0.2
	RELENG_9_1_0_RELEASE:1.22.2.1.4.2
	RELENG_9_1:1.22.2.1.0.4
	RELENG_9_1_BP:1.22.2.1
	RELENG_8_3_0_RELEASE:1.20.2.2.8.1
	RELENG_8_3:1.20.2.2.0.8
	RELENG_8_3_BP:1.20.2.2
	RELENG_9_0_0_RELEASE:1.22.2.1.2.1
	RELENG_9_0:1.22.2.1.0.2
	RELENG_9_0_BP:1.22.2.1
	RELENG_9:1.22.0.2
	RELENG_9_BP:1.22
	RELENG_7_4_0_RELEASE:1.17.2.2.8.1
	RELENG_8_2_0_RELEASE:1.20.2.2.6.1
	RELENG_7_4:1.17.2.2.0.8
	RELENG_7_4_BP:1.17.2.2
	RELENG_8_2:1.20.2.2.0.6
	RELENG_8_2_BP:1.20.2.2
	RELENG_8_1_0_RELEASE:1.20.2.2.4.1
	RELENG_8_1:1.20.2.2.0.4
	RELENG_8_1_BP:1.20.2.2
	RELENG_7_3_0_RELEASE:1.17.2.2.6.1
	RELENG_7_3:1.17.2.2.0.6
	RELENG_7_3_BP:1.17.2.2
	RELENG_8_0_0_RELEASE:1.20.2.2.2.1
	RELENG_8_0:1.20.2.2.0.2
	RELENG_8_0_BP:1.20.2.2
	RELENG_8:1.20.0.2
	RELENG_8_BP:1.20
	RELENG_7_2_0_RELEASE:1.17.2.2.4.1
	RELENG_7_2:1.17.2.2.0.4
	RELENG_7_2_BP:1.17.2.2
	RELENG_7_1_0_RELEASE:1.17.2.2.2.1
	RELENG_6_4_0_RELEASE:1.14.2.5.2.1
	RELENG_7_1:1.17.2.2.0.2
	RELENG_7_1_BP:1.17.2.2
	RELENG_6_4:1.14.2.5.0.2
	RELENG_6_4_BP:1.14.2.5
	RELENG_7_0_0_RELEASE:1.17.2.1.2.1
	RELENG_6_3_0_RELEASE:1.14.2.3.2.1
	RELENG_7_0:1.17.2.1.0.2
	RELENG_7_0_BP:1.17.2.1
	RELENG_6_3:1.14.2.3.0.2
	RELENG_6_3_BP:1.14.2.3
	RELENG_7:1.17.0.2
	RELENG_7_BP:1.17
	RELENG_6_2_0_RELEASE:1.14.2.2
	RELENG_6_2:1.14.2.2.0.2
	RELENG_6_2_BP:1.14.2.2
	RELENG_5_5_0_RELEASE:1.11.2.2
	RELENG_5_5:1.11.2.2.0.2
	RELENG_5_5_BP:1.11.2.2
	RELENG_6_1_0_RELEASE:1.14.2.1
	RELENG_6_1:1.14.2.1.0.2
	RELENG_6_1_BP:1.14.2.1
	RELENG_6_0_0_RELEASE:1.14
	RELENG_6_0:1.14.0.4
	RELENG_6_0_BP:1.14
	RELENG_6:1.14.0.2
	RELENG_6_BP:1.14
	RELENG_5_4_0_RELEASE:1.11.2.1
	RELENG_5_4:1.11.2.1.0.4
	RELENG_5_4_BP:1.11.2.1
	RELENG_5_3_0_RELEASE:1.11.2.1
	RELENG_5_3:1.11.2.1.0.2
	RELENG_5_3_BP:1.11.2.1
	RELENG_5:1.11.0.2
	RELENG_5_BP:1.11
	RELENG_5_2_1_RELEASE:1.8
	RELENG_5_2_0_RELEASE:1.8
	RELENG_5_2:1.8.0.2
	RELENG_5_2_BP:1.8
	RELENG_5_1_0_RELEASE:1.6
	RELENG_5_1:1.6.0.2
	RELENG_5_1_BP:1.6
	RELENG_5_0_0_RELEASE:1.4
	RELENG_5_0:1.4.0.2
	RELENG_5_0_BP:1.4
	head_20020621:1.1.1.2
	head_20010615:1.1.1.1
	NETBSD:1.1.1;
locks; strict;
comment	@# @;


1.24
date	2012.11.17.01.49.05;	author svnexp;	state Exp;
branches
	1.24.2.1;
next	1.23;

1.23
date	2012.09.11.05.04.59;	author obrien;	state Exp;
branches;
next	1.22;

1.22
date	2011.01.06.21.09.22;	author imp;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	2009.10.10.22.17.03;	author dougb;	state Exp;
branches;
next	1.20;

1.20
date	2008.06.23.04.46.54;	author mtm;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	2007.12.13.00.51.01;	author jhb;	state Exp;
branches;
next	1.18;

1.18
date	2007.12.08.07.20.22;	author dougb;	state Exp;
branches;
next	1.17;

1.17
date	2006.12.30.22.53.20;	author yar;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2006.06.21.10.22.44;	author flz;	state Exp;
branches;
next	1.15;

1.15
date	2006.01.08.10.15.30;	author dougb;	state Exp;
branches;
next	1.14;

1.14
date	2005.01.16.08.34.30;	author obrien;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2005.01.16.03.12.03;	author obrien;	state Exp;
branches;
next	1.12;

1.12
date	2004.10.07.13.55.26;	author mtm;	state Exp;
branches;
next	1.11;

1.11
date	2004.03.05.07.43.38;	author mtm;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2004.01.17.10.40.45;	author mtm;	state Exp;
branches;
next	1.9;

1.9
date	2004.01.17.10.16.38;	author mtm;	state Exp;
branches;
next	1.8;

1.8
date	2003.08.17.07.49.11;	author gordon;	state Exp;
branches;
next	1.7;

1.7
date	2003.06.30.15.02.05;	author trhodes;	state Exp;
branches;
next	1.6;

1.6
date	2003.05.18.03.39.39;	author mtm;	state Exp;
branches;
next	1.5;

1.5
date	2003.04.30.07.12.09;	author mtm;	state Exp;
branches;
next	1.4;

1.4
date	2002.09.17.01.48.48;	author peter;	state Exp;
branches;
next	1.3;

1.3
date	2002.09.06.16.18.05;	author gordon;	state Exp;
branches;
next	1.2;

1.2
date	2002.06.13.22.14.36;	author gordon;	state Exp;
branches;
next	1.1;

1.1
date	2001.06.16.07.16.14;	author obrien;	state Exp;
branches
	1.1.1.1;
next	;

1.24.2.1
date	2012.11.17.01.49.05;	author svnexp;	state dead;
branches;
next	1.24.2.2;

1.24.2.2
date	2013.03.28.13.02.43;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.22.2.1.2.1
	1.22.2.1.4.1;
next	1.22.2.2;

1.22.2.2
date	2012.10.26.18.06.49;	author obrien;	state Exp;
branches;
next	1.22.2.3;

1.22.2.3
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.22.2.1.2.2;

1.22.2.1.2.2
date	2012.11.17.08.36.11;	author svnexp;	state Exp;
branches;
next	;

1.22.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.22.2.1.4.2;

1.22.2.1.4.2
date	2012.11.17.08.47.01;	author svnexp;	state Exp;
branches;
next	;

1.20.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches;
next	1.20.2.2;

1.20.2.2
date	2009.10.16.00.17.09;	author dougb;	state Exp;
branches
	1.20.2.2.2.1
	1.20.2.2.4.1
	1.20.2.2.6.1
	1.20.2.2.8.1;
next	1.20.2.3;

1.20.2.3
date	2012.11.17.10.35.56;	author svnexp;	state Exp;
branches;
next	;

1.20.2.2.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.20.2.2.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.20.2.2.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.20.2.2.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.20.2.2.8.2;

1.20.2.2.8.2
date	2012.11.17.08.24.38;	author svnexp;	state Exp;
branches;
next	;

1.17.2.1
date	2007.12.18.01.34.09;	author jhb;	state Exp;
branches
	1.17.2.1.2.1;
next	1.17.2.2;

1.17.2.2
date	2008.01.28.07.55.44;	author dougb;	state Exp;
branches
	1.17.2.2.2.1
	1.17.2.2.4.1
	1.17.2.2.6.1
	1.17.2.2.8.1;
next	1.17.2.3;

1.17.2.3
date	2012.11.17.08.01.21;	author svnexp;	state Exp;
branches;
next	;

1.17.2.1.2.1
date	2008.01.28.07.58.31;	author dougb;	state Exp;
branches;
next	;

1.17.2.2.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.17.2.2.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.17.2.2.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.17.2.2.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.17.2.2.8.2;

1.17.2.2.8.2
date	2012.11.17.08.16.37;	author svnexp;	state Exp;
branches;
next	;

1.14.2.1
date	2006.01.17.06.53.17;	author dougb;	state Exp;
branches;
next	1.14.2.2;

1.14.2.2
date	2006.06.28.12.49.45;	author flz;	state Exp;
branches;
next	1.14.2.3;

1.14.2.3
date	2007.10.25.14.36.11;	author mtm;	state Exp;
branches
	1.14.2.3.2.1;
next	1.14.2.4;

1.14.2.4
date	2007.12.18.01.34.46;	author jhb;	state Exp;
branches;
next	1.14.2.5;

1.14.2.5
date	2008.01.28.08.22.32;	author dougb;	state Exp;
branches
	1.14.2.5.2.1;
next	1.14.2.6;

1.14.2.6
date	2012.11.17.07.39.08;	author svnexp;	state Exp;
branches;
next	;

1.14.2.3.2.1
date	2007.12.18.01.35.26;	author jhb;	state Exp;
branches;
next	;

1.14.2.5.2.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.11.2.1
date	2004.10.10.09.50.53;	author mtm;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2006.01.17.07.33.33;	author dougb;	state Exp;
branches;
next	;

1.1.1.1
date	2001.06.16.07.16.14;	author obrien;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2002.06.21.19.07.21;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.24
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/ldconfig 240336 2012-09-11 05:04:59Z obrien $
#

# PROVIDE: ldconfig
# REQUIRE: mountcritremote FILESYSTEMS
# BEFORE:  DAEMON

. /etc/rc.subr

name="ldconfig"
ldconfig_command="/sbin/ldconfig"
start_cmd="ldconfig_start"
stop_cmd=":"

ldconfig_start()
{
	local _files _ins

	_ins=
	ldconfig=${ldconfig_command}
	checkyesno ldconfig_insecure && _ins="-i"
	if [ -x "${ldconfig_command}" ]; then
		_LDC="/lib /usr/lib"
		for i in ${ldconfig_local_dirs}; do
			if [ -d "${i}" ]; then
				_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
			if [ -r "${i}" ]; then
				_LDC="${_LDC} ${i}"
			fi
		done
		check_startmsgs && echo 'ELF ldconfig path:' ${_LDC}
		${ldconfig} -elf ${_ins} ${_LDC}

		case `sysctl -n hw.machine_arch` in
		amd64)
			for i in ${ldconfig_local32_dirs}; do
				if [ -d "${i}" ]; then
					_files=`find ${i} -type f`
					if [ -n "${_files}" ]; then
						ldconfig32_paths="${ldconfig32_paths} `cat ${_files} | sort -u`"
					fi
				fi
			done
			_LDC=""
			for i in ${ldconfig32_paths}; do
				if [ -r "${i}" ]; then
					_LDC="${_LDC} ${i}"
				fi
			done
			check_startmsgs &&
			    echo '32-bit compatibility ldconfig path:' ${_LDC}
			${ldconfig} -32 -m ${_ins} ${_LDC}
			;;
		esac

		# Legacy aout support for i386 only
		case `sysctl -n hw.machine_arch` in
		i386)
			# Default the a.out ldconfig path.
			: ${ldconfig_paths_aout=${ldconfig_paths}}
			_LDC=""
			for i in /usr/lib/aout ${ldconfig_paths_aout} /etc/ld.so.conf; do
				if [ -r "${i}" ]; then
					_LDC="${_LDC} ${i}"
				fi
			done
			check_startmsgs && echo 'a.out ldconfig path:' ${_LDC}
			${ldconfig} -aout ${_ins} ${_LDC}
			;;
		esac
	fi
}

load_rc_config $name
run_rc_command "$1"
@


1.24.2.1
log
@file ldconfig was added on branch RELENG_8_4 on 2013-03-28 13:02:43 +0000
@
text
@d1 83
@


1.24.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 83
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/ldconfig 198164 2009-10-16 00:17:09Z dougb $
#

# PROVIDE: ldconfig
# REQUIRE: mountcritremote cleanvar
# BEFORE:  DAEMON

. /etc/rc.subr

name="ldconfig"
ldconfig_command="/sbin/ldconfig"
start_cmd="ldconfig_start"
stop_cmd=":"

ldconfig_start()
{
	local _files _ins

	_ins=
	ldconfig=${ldconfig_command}
	checkyesno ldconfig_insecure && _ins="-i"
	if [ -x "${ldconfig_command}" ]; then
		_LDC="/lib /usr/lib"
		for i in ${ldconfig_local_dirs}; do
			if [ -d "${i}" ]; then
				_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
			if [ -r "${i}" ]; then
				_LDC="${_LDC} ${i}"
			fi
		done
		check_startmsgs && echo 'ELF ldconfig path:' ${_LDC}
		${ldconfig} -elf ${_ins} ${_LDC}

		case `sysctl -n hw.machine_arch` in
		amd64)
			for i in ${ldconfig_local32_dirs}; do
				if [ -d "${i}" ]; then
					_files=`find ${i} -type f`
					if [ -n "${_files}" ]; then
						ldconfig32_paths="${ldconfig32_paths} `cat ${_files} | sort -u`"
					fi
				fi
			done
			_LDC=""
			for i in ${ldconfig32_paths}; do
				if [ -r "${i}" ]; then
					_LDC="${_LDC} ${i}"
				fi
			done
			check_startmsgs &&
			    echo '32-bit compatibility ldconfig path:' ${_LDC}
			${ldconfig} -32 -m ${_ins} ${_LDC}
			;;
		esac

		# Legacy aout support for i386 only
		case `sysctl -n hw.machine_arch` in
		i386)
			# Default the a.out ldconfig path.
			: ${ldconfig_paths_aout=${ldconfig_paths}}
			_LDC=/usr/lib/aout
			for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
				if [ -r "${i}" ]; then
					_LDC="${_LDC} ${i}"
				fi
			done
			check_startmsgs && echo 'a.out ldconfig path:' ${_LDC}
			${ldconfig} -aout ${_ins} ${_LDC}
			;;
		esac
	fi
}

load_rc_config $name
run_rc_command "$1"
@


1.23
log
@SVN rev 240336 on 2012-09-11 05:04:59Z by obrien

Simply things so that "#REQUIRE: FILESYSTEMS" means the file
systems are fully "ready to go".

'FILESYSTEMS' states: "This is a dummy dependency, for services which
require file systems to be mounted before starting."  However, we have
'var' which is was run after 'FILESYSTEMS' and can mount /var if it
already isn't mounted.  Furthermore, several scripts cannot use /var
until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
meant all critical file systems are fully usable.
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.22
log
@SVN rev 217073 on 2011-01-06 21:09:22Z by imp

Don't require /usr/lib/aout to be on the system.  Test for its
existance since we don't generally need it.

MFC after:	1 week
@
text
@d7 1
a7 1
# REQUIRE: mountcritremote cleanvar
@


1.22.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.22.2.2
log
@SVN rev 242153 on 2012-10-26 18:06:49Z by obrien

MFC: r240336:
  Simply things so that "#REQUIRE: FILESYSTEMS" means the file
  systems are fully "ready to go".

  'FILESYSTEMS' states: "This is a dummy dependency, for services which
  require file systems to be mounted before starting."  However, we have
  'var' which is was run after 'FILESYSTEMS' and can mount /var if it
  already isn't mounted.  Furthermore, several scripts cannot use /var
  until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
  meant all critical file systems are fully usable.
@
text
@d7 1
a7 1
# REQUIRE: mountcritremote FILESYSTEMS
@


1.22.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/9/etc/rc.d/ldconfig 242153 2012-10-26 18:06:49Z obrien $
@


1.22.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.22.2.1.4.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/ldconfig 217073 2011-01-06 21:09:22Z imp $
@


1.22.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.22.2.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/ldconfig 217073 2011-01-06 21:09:22Z imp $
@


1.21
log
@SVN rev 197947 on 2009-10-10 22:17:03Z by dougb

In regards to the "Starting foo:" type messages at boot time, create and
employ a more generic solution, and use it in the individual rc.d scripts
that also have an $rc_quiet test:

1. Add check_startmsgs() to rc.subr.
2. In the rc.d scripts that use rc_quiet (and rc.subr) substitute
variations of [ -z "$rc_quiet" ] with check_startmsgs
3. In savecore add a trailing '.' to the end of the message to make it
more consistent with other scripts.
4. In newsyslog remove a : before the terminal '.' since we do not expect
there to be anything printed out in between to make it more consistent.
5. In the following scripts change "quotes" to 'quotes' where no variables
exist in the message: savecore pf newsyslog
6. In the following scripts substitute if/then/fi for the simpler (and
more consistent) check_startmsgs &&: faith stf
7. In the following scripts separate the "Starting foo:" from the terminal
'.' to make them more consistent: moused hostname pf
8. In nfsclient move the message to its own line to avoid a style bug
9. In pf rc_quiet does not apply to the _stop method, so remove the
test there.
10. In motd add 'quotes' around the terminal '.' for consistency
@
text
@d69 2
a70 2
			_LDC=/usr/lib/aout
			for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
@


1.20
log
@SVN rev 179945 on 2008-06-23 04:46:54Z by mtm

Move a lot of diagnostic output behind $rc_quiet in scripts that
implement their own start command.
@
text
@d39 1
a39 1
		[ -z "${rc_quiet}" ] && echo 'ELF ldconfig path:' ${_LDC}
d58 1
a58 1
			[ -z "${rc_quiet}" ] &&
d75 1
a75 2
			[ -z "${rc_quiet}" ] &&
			    echo 'a.out ldconfig path:' ${_LDC}
@


1.20.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.20.2.2
log
@SVN rev 198164 on 2009-10-16 00:17:09Z by dougb

MFC r197947:

In regards to the "Starting foo:" type messages at boot time, create
and employ a more generic solution, and use it in the individual rc.d
scripts that also have an $rc_quiet test:

1. Add check_startmsgs() to rc.subr.
2. In the rc.d scripts that use rc_quiet (and rc.subr) substitute
variations of [ -z "$rc_quiet" ] with check_startmsgs
3. In savecore add a trailing '.' to the end of the message to make it
more consistent with other scripts.
4. In newsyslog remove a : before the terminal '.' since we do not
expect there to be anything printed out in between to make it more
consistent.
5. In the following scripts change "quotes" to 'quotes' where no
variables exist in the message: savecore pf newsyslog
6. [Does not apply in RELENG_8]
7. In the following scripts separate the "Starting foo:" from the
terminal '.' to make them more consistent: moused hostname pf
8. In nfsclient move the message to its own line to avoid a style bug
9. In pf rc_quiet does not apply to the _stop method, so remove the
test there.
10. In motd add 'quotes' around the terminal '.' for consistency

Approved by:	re (kib)
@
text
@d39 1
a39 1
		check_startmsgs && echo 'ELF ldconfig path:' ${_LDC}
d58 1
a58 1
			check_startmsgs &&
d75 2
a76 1
			check_startmsgs && echo 'a.out ldconfig path:' ${_LDC}
@


1.20.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/8/etc/rc.d/ldconfig 198164 2009-10-16 00:17:09Z dougb $
@


1.20.2.2.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.20.2.2.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/ldconfig 198164 2009-10-16 00:17:09Z dougb $
@


1.20.2.2.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.20.2.2.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.20.2.2.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.19
log
@Only pass paths to directories or config files that exist for ldconfig for
32-bit binaries.

MFC after:	3 days
@
text
@d39 1
a39 1
		echo 'ELF ldconfig path:' ${_LDC}
d58 2
a59 1
			echo '32-bit compatibility ldconfig path:' ${_LDC}
d75 2
a76 1
			echo 'a.out ldconfig path:' ${_LDC}
@


1.18
log
@Remove $NetBSD$ CVS tags. We no longer attempt to synch our rc.d files
with theirs, so this information doesn't need to be in the live file.
Having it in our CVS history is enough.
@
text
@d52 8
a59 2
			echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths}
			${ldconfig} -32 -m ${_ins} ${ldconfig32_paths}
@


1.17
log
@Eliminate global symbols starting with an underscore from rc.d
scripts, except for mdconfig* and jail.  Such symbols are reserved
for the rc.subr internals.  Most scripts can be fixed by just
declaring _foo symbols as local: few scripts actually need them to
be global.

Discussed with:	dougb in freebsd-rc
@
text
@a2 1
# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $
@


1.17.2.1
log
@MFC: Only pass paths to directories or config files that exist for ldconfig
for 32-bit binaries.

Approved by:	re (kensmith)
@
text
@d53 2
a54 8
			_LDC=""
			for i in ${ldconfig32_paths}; do
				if [ -r "${i}" ]; then
					_LDC="${_LDC} ${i}"
				fi
			done
			echo '32-bit compatibility ldconfig path:' ${_LDC}
			${ldconfig} -32 -m ${_ins} ${_LDC}
@


1.17.2.1.2.1
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.

Approved by:	re (kensmith)
@
text
@d3 1
@


1.17.2.2
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.
@
text
@d3 1
@


1.17.2.3
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/ldconfig 175736 2008-01-28 07:55:44Z dougb $
@


1.17.2.2.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.17.2.2.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/ldconfig 175736 2008-01-28 07:55:44Z dougb $
@


1.17.2.2.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.17.2.2.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.17.2.2.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.16
log
@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
@
text
@d20 1
a20 1
	local _files
@


1.15
log
@Add a mechanism to include files added by ports which contain
the names of directories to include in the base ldconfig script.
This will eliminate the need for each port to install its own
boot script which does nothing but ldocnfig a given directory.

This code was developed by flz (ports committer), discussed on
freebsd-rc@@, and modified slightly by me.

Submitted by:	flz
Reviewed by:	brooks
@
text
@d20 2
d29 4
a32 1
				ldconfig_paths="${ldconfig_paths} `find ${i} -type f`"
d47 4
a50 1
					ldconfig32_paths="${ldconfig32_paths} `find ${i} -type f`"
@


1.14
log
@Remove debugging that made it into the commit.
@
text
@d25 5
d38 12
@


1.14.2.1
log
@MFC mechanism to include files added by ports which contain
names of directories to include in the base ldconfig script.

Bump __FreeBSD_version to recognize this change
@
text
@a24 5
		for i in ${ldconfig_local_dirs}; do
			if [ -d "${i}" ]; then
				ldconfig_paths="${ldconfig_paths} `find ${i} -type f`"
			fi
		done
a32 12
		case `sysctl -n hw.machine_arch` in
		amd64)
			for i in ${ldconfig_local32_dirs}; do
				if [ -d "${i}" ]; then
					ldconfig32_paths="${ldconfig32_paths} `find ${i} -type f`"
				fi
			done
			echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths}
			${ldconfig} -32 -m ${_ins} ${ldconfig32_paths}
			;;
		esac

@


1.14.2.2
log
@MFC:

  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.

      src/etc/rc.d/ldconfig: rev 1.15 -> 1.16
@
text
@a19 2
	local _files

d27 1
a27 4
				_files=`find ${i} -type f`
				if [ -n "${_files}" ]; then
					ldconfig_paths="${ldconfig_paths} `cat ${_files} | sort -u`"
				fi
d42 1
a42 4
					_files=`find ${i} -type f`
					if [ -n "${_files}" ]; then
						ldconfig32_paths="${ldconfig32_paths} `cat ${_files} | sort -u`"
					fi
@


1.14.2.3
log
@MFC:
  Eliminate global symbols starting with an underscore from rc.d
  scripts, except for mdconfig* and jail.  Such symbols are reserved
  for the rc.subr internals.  Most scripts can be fixed by just
  declaring _foo symbols as local: few scripts actually need them to
  be global.
@
text
@d20 1
a20 1
	local _files _ins
@


1.14.2.3.2.1
log
@MFC: Only pass paths to directories or config files that exist for ldconfig
for 32-bit binaries.

Approved by:	re (kensmith)
@
text
@d53 2
a54 8
			_LDC=""
			for i in ${ldconfig32_paths}; do
				if [ -r "${i}" ]; then
					_LDC="${_LDC} ${i}"
				fi
			done
			echo '32-bit compatibility ldconfig path:' ${_LDC}
			${ldconfig} -32 -m ${_ins} ${_LDC}
@


1.14.2.4
log
@MFC: Only pass paths to directories or config files that exist for ldconfig
for 32-bit binaries.
@
text
@d53 2
a54 8
			_LDC=""
			for i in ${ldconfig32_paths}; do
				if [ -r "${i}" ]; then
					_LDC="${_LDC} ${i}"
				fi
			done
			echo '32-bit compatibility ldconfig path:' ${_LDC}
			${ldconfig} -32 -m ${_ins} ${_LDC}
@


1.14.2.5
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.
@
text
@d3 1
@


1.14.2.6
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/ldconfig 175742 2008-01-28 08:22:33Z dougb $
@


1.14.2.5.2.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.13
log
@"REQUIRE: cleanvar" for all RC's writing into /var/run.
@
text
@a30 1
ldconfig -r >/tmp/ldcon.`basename $0`.0before
a31 1
ldconfig -r >/tmp/ldcon.`basename $0`.1after
@


1.12
log
@Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@d8 1
a8 1
# REQUIRE: mountcritremote
d31 1
d33 1
@


1.11
log
@Remove scripts we don't use from requirement lines. These were
hold-overs from the initial NetBSD import.
@
text
@a9 1
# KEYWORD: FreeBSD
@


1.11.2.1
log
@RCS file: /home/ncvs/src/etc/rc,v
----------------------------
revision 1.335
date: 2004/10/08 14:23:49;  author: mtm;  state: Exp;  lines: +0 -1
Remove an unused variable.

Submitted by: Pawel Worach <pawel.worach@@telia.com>
----------------------------
revision 1.334
date: 2004/10/07 13:55:25;  author: mtm;  state: Exp;  lines: +1 -1
Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
=============================================================================
RCS file: /home/ncvs/src/etc/rc.d/nsswitch,v
----------------------------
revision 1.4
date: 2004/09/16 17:03:12;  author: keramida;  state: Exp;  lines: +1 -1
Fix requirement of `network' to `NETWORK' because the former isn't
provided by any rc.d script.

Approved by:	mtm
=============================================================================
RCS file: /home/ncvs/src/etc/rc.d/pflog,v
----------------------------
revision 1.3
date: 2004/09/16 17:04:20;  author: keramida;  state: Exp;  lines: +1 -1
We don't have any providers of `beforenetlkm' in FreeBSD.  Remove the
dependency to it from our rc.d scripts.

Approved by:	mtm
=============================================================================

Approved by: re/scottl
@
text
@d10 1
@


1.11.2.2
log
@MFC mechanism to include files added by ports which contain
names of directories to include in the base ldconfig script.

Bump __FreeBSD_version to recognize this change
@
text
@a24 5
		for i in ${ldconfig_local_dirs}; do
			if [ -d "${i}" ]; then
				ldconfig_paths="${ldconfig_paths} `find ${i} -type f`"
			fi
		done
a32 12
		case `sysctl -n hw.machine_arch` in
		amd64)
			for i in ${ldconfig_local32_dirs}; do
				if [ -d "${i}" ]; then
					ldconfig32_paths="${ldconfig32_paths} `find ${i} -type f`"
				fi
			done
			echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths}
			${ldconfig} -32 -m ${_ins} ${ldconfig32_paths}
			;;
		esac

@


1.10
log
@Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, remove
NetBSD specific stuff (which made our scripts more complicated
than necessary).

The NetBSD ident string will be left intact, both for history and
also incase we wish to pull in future versions.
@
text
@d8 1
a8 1
# REQUIRE: mountall mountcritremote
@


1.9
log
@Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, begin removal
of NetBSD specific stuff (which made our scripts more complicated
than necessary), starting with the NetBSD KEYWORD.
@
text
@d21 20
a40 8
	case ${OSTYPE} in
	FreeBSD)
		_ins=
		ldconfig=${ldconfig_command}
		checkyesno ldconfig_insecure && _ins="-i"
		if [ -x "${ldconfig_command}" ]; then
			_LDC="/lib /usr/lib"
			for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
d45 5
a49 29
			echo 'ELF ldconfig path:' ${_LDC}
			${ldconfig} -elf ${_ins} ${_LDC}

			# Legacy aout support for i386 only
			case `sysctl -n hw.machine_arch` in
			i386)
				# Default the a.out ldconfig path.
				: ${ldconfig_paths_aout=${ldconfig_paths}}
				_LDC=/usr/lib/aout
				for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
					if [ -r "${i}" ]; then
						_LDC="${_LDC} ${i}"
					fi
				done
				echo 'a.out ldconfig path:' ${_LDC}
				${ldconfig} -aout ${_ins} ${_LDC}
				;;
			esac
		fi
		;;
	NetBSD)
		if [ -f ${ldconfig_command} ]; then
			echo "Creating a.out runtime link editor directory cache."
			${ldconfig_command}
		fi
		;;
	*)
		;;
	esac
@


1.8
log
@Prepend /lib to the search order for libraries.
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD NetBSD
@


1.7
log
@Properly use ld.so.conf and ld-elf.so.conf as discussed in the manual page.

PR:		25527
Submitted by:	Alexey Neyman <alex.neyman@@auriga.ru>
Reviewed by:	jdp
@
text
@d27 1
a27 1
			_LDC=/usr/lib
@


1.6
log
@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
@
text
@d28 2
a29 2
			for i in ${ldconfig_paths}; do
				if [ -d "${i}" ]; then
d42 2
a43 2
				for i in ${ldconfig_paths_aout}; do
					if [ -d "${i}" ]; then
@


1.5
log
@This script should require mountcritremote, since that is the last
script at which a filesystem will be mounted in FreeBSD. Without this
the script was being inserted later in the boot than necessary.

Approved by:	markm (mentor) (implicit)
Reviewed by:	dougb
Noticed by:	Andrzej Toboa <san@@wilk.2a.pl>
@
text
@d23 1
d25 1
a25 1
		checkyesno ldconfig_insecure && ldconfig="${ldconfig} -i"
d34 1
a34 1
			${ldconfig} -elf ${_LDC}
d48 1
a48 1
				${ldconfig} -aout ${_LDC}
@


1.4
log
@Initiate deorbit burn for the i386-only a.out related support.  Moves are
under way to move the remnants of the a.out toolchain to ports.  As the
comment in src/Makefile said, this stuff is deprecated and one should not
expect this to remain beyond 4.0-REL.  It has already lasted WAY beyond
that.

Notable exceptions:
gcc - I have not touched the a.out generation stuff there.
ldd/ldconfig - still have some code to interface with a.out rtld.
old as/ld/etc - I have not removed these yet, pending their move to ports.
some includes - necessary for ldd/ldconfig for now.

Tested on: i386 (extensively), alpha
@
text
@d8 1
a8 1
# REQUIRE: mountall
@


1.3
log
@Convert from `${CMD_OSTYPE}` to ${OSTYPE}. This saves a shell invocation on
OS-dependent case switches.
@
text
@d26 8
a33 12
			case `/usr/bin/objformat` in
			elf)
				_LDC=/usr/lib
				for i in ${ldconfig_paths}; do
					if [ -d "${i}" ]; then
						_LDC="${_LDC} ${i}"
					fi
				done
				echo 'ELF ldconfig path:' ${_LDC}
				${ldconfig} -elf ${_LDC}
				;;
			esac
@


1.2
log
@Merge in all the changes that Mike Makonnen has been maintaining for a
while. This is only the script pieces, the glue for the build comes next.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
Reviewed by:	silence on -current and -hackers
Prodded by:	rwatson
@
text
@d21 1
a21 1
	case `${CMD_OSTYPE}` in
@


1.1
log
@Initial revision
@
text
@d3 2
a4 1
# $NetBSD: ldconfig,v 1.2 2000/05/13 08:45:07 lukem Exp $
d9 2
d15 1
d21 44
a64 4
	if [ -f /sbin/ldconfig ]; then
		echo "Creating a.out runtime link editor directory cache."
		ldconfig
	fi
@


1.1.1.1
log
@Import the NetBSD 1.5 RC system.

Note that `rc' and `rc.shutdown' could not be imported because we already
have files with those names.
@
text
@@


1.1.1.2
log
@Sync with NetBSD's mainline.
@
text
@d3 1
a3 1
# $NetBSD: ldconfig,v 1.4 2001/04/25 13:00:17 lukem Exp $
a7 1
# BEFORE:  DAEMON
a11 1
ldconfig_command="/sbin/ldconfig"
d17 1
a17 1
	if [ -f ${ldconfig_command} ]; then
d19 1
a19 1
		${ldconfig_command}
@

