head	1.17;
access;
symbols
	RELENG_8_4:1.16.0.2
	RELENG_9_1_0_RELEASE:1.13.4.2.2.2
	RELENG_9_1:1.13.4.2.0.2
	RELENG_9_1_BP:1.13.4.2
	RELENG_8_3_0_RELEASE:1.13.2.2.2.1
	RELENG_8_3:1.13.2.2.0.2
	RELENG_8_3_BP:1.13.2.2
	RELENG_9_0_0_RELEASE:1.13.4.1.2.1
	RELENG_9_0:1.13.4.1.0.2
	RELENG_9_0_BP:1.13.4.1
	RELENG_9:1.13.0.4
	RELENG_9_BP:1.13
	RELENG_7_4_0_RELEASE:1.12.2.1.8.1
	RELENG_8_2_0_RELEASE:1.13.2.1.6.1
	RELENG_7_4:1.12.2.1.0.8
	RELENG_7_4_BP:1.12.2.1
	RELENG_8_2:1.13.2.1.0.6
	RELENG_8_2_BP:1.13.2.1
	RELENG_8_1_0_RELEASE:1.13.2.1.4.1
	RELENG_8_1:1.13.2.1.0.4
	RELENG_8_1_BP:1.13.2.1
	RELENG_7_3_0_RELEASE:1.12.2.1.6.1
	RELENG_7_3:1.12.2.1.0.6
	RELENG_7_3_BP:1.12.2.1
	RELENG_8_0_0_RELEASE:1.13.2.1.2.1
	RELENG_8_0:1.13.2.1.0.2
	RELENG_8_0_BP:1.13.2.1
	RELENG_8:1.13.0.2
	RELENG_8_BP:1.13
	RELENG_7_2_0_RELEASE:1.12.2.1.4.1
	RELENG_7_2:1.12.2.1.0.4
	RELENG_7_2_BP:1.12.2.1
	RELENG_7_1_0_RELEASE:1.12.2.1.2.1
	RELENG_6_4_0_RELEASE:1.10.2.3.2.1
	RELENG_7_1:1.12.2.1.0.2
	RELENG_7_1_BP:1.12.2.1
	RELENG_6_4:1.10.2.3.0.2
	RELENG_6_4_BP:1.10.2.3
	RELENG_7_0_0_RELEASE:1.12.4.1
	RELENG_6_3_0_RELEASE:1.10.2.2
	RELENG_7_0:1.12.0.4
	RELENG_7_0_BP:1.12
	RELENG_6_3:1.10.2.2.0.2
	RELENG_6_3_BP:1.10.2.2
	RELENG_7:1.12.0.2
	RELENG_7_BP:1.12
	RELENG_6_2_0_RELEASE:1.10.2.1
	RELENG_6_2:1.10.2.1.0.4
	RELENG_6_2_BP:1.10.2.1
	RELENG_5_5_0_RELEASE:1.9.2.1
	RELENG_5_5:1.9.2.1.0.6
	RELENG_5_5_BP:1.9.2.1
	RELENG_6_1_0_RELEASE:1.10.2.1
	RELENG_6_1:1.10.2.1.0.2
	RELENG_6_1_BP:1.10.2.1
	RELENG_6_0_0_RELEASE:1.10
	RELENG_6_0:1.10.0.4
	RELENG_6_0_BP:1.10
	RELENG_6:1.10.0.2
	RELENG_6_BP:1.10
	RELENG_5_4_0_RELEASE:1.9.2.1
	RELENG_5_4:1.9.2.1.0.4
	RELENG_5_4_BP:1.9.2.1
	RELENG_5_3_0_RELEASE:1.9.2.1
	RELENG_5_3:1.9.2.1.0.2
	RELENG_5_3_BP:1.9.2.1
	RELENG_5:1.9.0.2
	RELENG_5_BP:1.9
	RELENG_5_2_1_RELEASE:1.4
	RELENG_5_2_0_RELEASE:1.4
	RELENG_5_2:1.4.0.6
	RELENG_5_2_BP:1.4
	RELENG_5_1_0_RELEASE:1.4
	RELENG_5_1:1.4.0.4
	RELENG_5_1_BP:1.4
	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.17
date	2013.05.14.00.39.38;	author svnexp;	state Exp;
branches;
next	1.16;

1.16
date	2012.11.17.01.49.06;	author svnexp;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	2012.09.11.05.04.59;	author obrien;	state Exp;
branches;
next	1.14;

1.14
date	2012.01.14.02.18.41;	author dougb;	state Exp;
branches;
next	1.13;

1.13
date	2007.12.08.07.20.22;	author dougb;	state Exp;
branches
	1.13.2.1
	1.13.4.1;
next	1.12;

1.12
date	2006.12.30.22.53.20;	author yar;	state Exp;
branches
	1.12.2.1
	1.12.4.1;
next	1.11;

1.11
date	2005.12.21.09.54.15;	author dougb;	state Exp;
branches;
next	1.10;

1.10
date	2004.10.07.13.55.26;	author mtm;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2004.03.05.07.55.04;	author mtm;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2004.03.05.07.43.38;	author mtm;	state Exp;
branches;
next	1.7;

1.7
date	2004.01.17.11.19.01;	author mtm;	state Exp;
branches;
next	1.6;

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

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

1.4
date	2002.10.01.13.29.44;	author ru;	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.16.2.1
date	2012.11.17.01.49.06;	author svnexp;	state dead;
branches;
next	1.16.2.2;

1.16.2.2
date	2013.03.28.13.02.44;	author svnexp;	state Exp;
branches;
next	;

1.13.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.13.2.1.2.1
	1.13.2.1.4.1
	1.13.2.1.6.1;
next	1.13.2.2;

1.13.2.2
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches
	1.13.2.2.2.1;
next	1.13.2.3;

1.13.2.3
date	2012.11.17.10.35.57;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.13.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.13.2.2.2.2;

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

1.13.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.13.4.1.2.1;
next	1.13.4.2;

1.13.4.2
date	2012.02.14.10.16.56;	author dougb;	state Exp;
branches
	1.13.4.2.2.1;
next	1.13.4.3;

1.13.4.3
date	2012.10.26.18.06.49;	author obrien;	state Exp;
branches;
next	1.13.4.4;

1.13.4.4
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	1.13.4.5;

1.13.4.5
date	2013.06.12.20.01.44;	author svnexp;	state Exp;
branches;
next	;

1.13.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.13.4.1.2.2;

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

1.13.4.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.13.4.2.2.2;

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

1.12.2.1
date	2008.01.28.07.55.44;	author dougb;	state Exp;
branches
	1.12.2.1.2.1
	1.12.2.1.4.1
	1.12.2.1.6.1
	1.12.2.1.8.1;
next	1.12.2.2;

1.12.2.2
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.12.2.3;

1.12.2.3
date	2012.11.17.08.01.23;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.12.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.12.2.1.8.2;

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

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

1.10.2.1
date	2006.01.17.06.46.54;	author dougb;	state Exp;
branches;
next	1.10.2.2;

1.10.2.2
date	2007.10.25.14.36.11;	author mtm;	state Exp;
branches;
next	1.10.2.3;

1.10.2.3
date	2008.01.28.08.22.33;	author dougb;	state Exp;
branches
	1.10.2.3.2.1;
next	1.10.2.4;

1.10.2.4
date	2012.11.17.07.39.09;	author svnexp;	state Exp;
branches;
next	;

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

1.9.2.1
date	2004.10.10.09.50.54;	author mtm;	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.17
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/250617
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/syslogd 250617 2013-05-13 20:28:24Z asomers $
#

# netif is required for lo0 because syslogd tries to open a local socket
#
# PROVIDE: syslogd
# REQUIRE: mountcritremote FILESYSTEMS newsyslog netif
# BEFORE:  SERVERS

. /etc/rc.subr

name="syslogd"
rcvar="syslogd_enable"
pidfile="/var/run/syslog.pid"
command="/usr/sbin/${name}"
required_files="/etc/syslog.conf"
start_precmd="syslogd_precmd"
extra_commands="reload"

sockfile="/var/run/syslogd.sockets"
evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
altlog_proglist="named"

syslogd_precmd()
{
	local _l _ldir

	#	Transitional symlink for old binaries
	#
	if [ ! -L /dev/log ]; then
		ln -sf /var/run/log /dev/log
	fi
	rm -f /var/run/log

	#	Create default list of syslog sockets to watch
	#
	( umask 022 ; > $sockfile )

	#	If running named(8) or ntpd(8) chrooted, added appropriate
	#	syslog socket to list of sockets to watch.
	#
	for _l in $altlog_proglist; do
		eval _ldir=\$${_l}_chrootdir
		if checkyesno ${_l}_enable && [ -n "$_ldir" ]; then
			echo "${_ldir}/var/run/log" >> $sockfile
		fi
	done

	#	If other sockets have been provided, change run_rc_command()'s
	#	internal copy of $syslogd_flags to force use of specific
	#	syslogd sockets.
	#
	if [ -s $sockfile ]; then
		echo "/var/run/log" >> $sockfile
		eval $evalargs
	fi

	return 0
}

set_socketlist()
{
	local _s _socketargs

	_socketargs=
	for _s in `cat $sockfile | tr '\n' ' '` ; do
		_socketargs="-l $_s $_socketargs"
	done
	echo $_socketargs
}
load_rc_config $name
run_rc_command "$1"
@


1.16
log
@Switching exporter and resync
@
text
@d3 1
a3 1
# $FreeBSD: head/etc/rc.d/syslogd 240336 2012-09-11 05:04:59Z obrien $
d6 2
d9 1
a9 1
# REQUIRE: mountcritremote FILESYSTEMS newsyslog
@


1.16.2.1
log
@file syslogd was added on branch RELENG_8_4 on 2013-03-28 13:02:44 +0000
@
text
@d1 72
@


1.16.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 72
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/syslogd 231655 2012-02-14 10:17:14Z dougb $
#

# PROVIDE: syslogd
# REQUIRE: mountcritremote cleanvar newsyslog
# BEFORE:  SERVERS

. /etc/rc.subr

name="syslogd"
rcvar="syslogd_enable"
pidfile="/var/run/syslog.pid"
command="/usr/sbin/${name}"
required_files="/etc/syslog.conf"
start_precmd="syslogd_precmd"
extra_commands="reload"

sockfile="/var/run/syslogd.sockets"
evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
altlog_proglist="named"

syslogd_precmd()
{
	local _l _ldir

	#	Transitional symlink for old binaries
	#
	if [ ! -L /dev/log ]; then
		ln -sf /var/run/log /dev/log
	fi
	rm -f /var/run/log

	#	Create default list of syslog sockets to watch
	#
	( umask 022 ; > $sockfile )

	#	If running named(8) or ntpd(8) chrooted, added appropriate
	#	syslog socket to list of sockets to watch.
	#
	for _l in $altlog_proglist; do
		eval _ldir=\$${_l}_chrootdir
		if checkyesno ${_l}_enable && [ -n "$_ldir" ]; then
			echo "${_ldir}/var/run/log" >> $sockfile
		fi
	done

	#	If other sockets have been provided, change run_rc_command()'s
	#	internal copy of $syslogd_flags to force use of specific
	#	syslogd sockets.
	#
	if [ -s $sockfile ]; then
		echo "/var/run/log" >> $sockfile
		eval $evalargs
	fi

	return 0
}

set_socketlist()
{
	local _s _socketargs

	_socketargs=
	for _s in `cat $sockfile | tr '\n' ' '` ; do
		_socketargs="-l $_s $_socketargs"
	done
	echo $_socketargs
}
load_rc_config $name
run_rc_command "$1"
@


1.15
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.14
log
@SVN rev 230099 on 2012-01-14 02:18:41Z by dougb

Prepare for the removal of set_rcvar() by changing the rcvar=
assignments to the literal values it would have returned.

The concept of set_rcvar() was nice in theory, but the forks
it creates are a drag on the startup process, which is especially
noticeable on slower systems, such as embedded ones.

During the discussion on freebsd-rc@@ a preference was expressed for
using ${name}_enable instead of the literal values. However the
code portability concept doesn't really apply since there are so
many other places where the literal name has to be searched for
and replaced. Also, using the literal value is also a tiny bit
faster than dereferencing the variables, and every little bit helps.
@
text
@d7 1
a7 1
# REQUIRE: mountcritremote cleanvar newsyslog
@


1.13
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
@d13 1
a13 1
rcvar=`set_rcvar`
d44 1
a44 1
		if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
@


1.13.4.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.13.4.2
log
@SVN rev 231653 on 2012-02-14 10:16:56Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="syslogd_enable"
d44 1
a44 1
		if checkyesno ${_l}_enable && [ -n "$_ldir" ]; then
@


1.13.4.3
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 newsyslog
@


1.13.4.4
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/syslogd 242153 2012-10-26 18:06:49Z obrien $
@


1.13.4.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251663
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d3 1
a3 1
# $FreeBSD: stable/9/etc/rc.d/syslogd 251663 2013-06-12 19:04:08Z asomers $
a5 2
# netif is required for lo0 because syslogd tries to open a local socket
#
d7 1
a7 1
# REQUIRE: mountcritremote FILESYSTEMS newsyslog netif
@


1.13.4.2.2.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.13.4.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/syslogd 231653 2012-02-14 10:16:56Z dougb $
@


1.13.4.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.13.4.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/syslogd 174438 2007-12-08 07:20:23Z dougb $
@


1.13.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.13.2.2
log
@SVN rev 231655 on 2012-02-14 10:17:14Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="syslogd_enable"
d44 1
a44 1
		if checkyesno ${_l}_enable && [ -n "$_ldir" ]; then
@


1.13.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/syslogd 231655 2012-02-14 10:17:14Z dougb $
@


1.13.2.2.2.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.13.2.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/syslogd 231655 2012-02-14 10:17:14Z dougb $
@


1.13.2.1.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.13.2.1.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.13.2.1.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.12
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: syslogd,v 1.12 2002/03/22 04:34:00 thorpej Exp $
@


1.12.4.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.12.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.
@
text
@d3 1
@


1.12.2.2
log
@SVN rev 231656 on 2012-02-14 10:17:30Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="syslogd_enable"
d44 1
a44 1
		if checkyesno ${_l}_enable && [ -n "$_ldir" ]; then
@


1.12.2.3
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/syslogd 231656 2012-02-14 10:17:30Z dougb $
@


1.12.2.1.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.12.2.1.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/syslogd 175736 2008-01-28 07:55:44Z dougb $
@


1.12.2.1.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.12.2.1.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.12.2.1.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.11
log
@syslogd should REQUIRE newsyslog, rather than newsyslog using
BEFORE: syslogd. This does not produce any change in the
ordering at the moment, but is cleaner style for the long term.
@
text
@d21 1
a21 1
_sockfile="/var/run/syslogd.sockets"
d27 2
d38 1
a38 1
	( umask 022 ; > $_sockfile )
d46 1
a46 1
			echo "${_ldir}/var/run/log" >> $_sockfile
d54 2
a55 2
	if [ -s $_sockfile ]; then
		echo "/var/run/log" >> $_sockfile
d64 2
d67 1
a67 1
	for _s in `cat $_sockfile | tr '\n' ' '` ; do
@


1.10
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 cleanvar
@


1.10.2.1
log
@MFC newsyslog 1.5, syslogd 1.11 - Swap REQUIRE and BEFORE
@
text
@d8 1
a8 1
# REQUIRE: mountcritremote cleanvar newsyslog
@


1.10.2.2
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
@d21 1
a21 1
sockfile="/var/run/syslogd.sockets"
a26 2
	local _l _ldir

d36 1
a36 1
	( umask 022 ; > $sockfile )
d44 1
a44 1
			echo "${_ldir}/var/run/log" >> $sockfile
d52 2
a53 2
	if [ -s $sockfile ]; then
		echo "/var/run/log" >> $sockfile
a61 2
	local _s _socketargs

d63 1
a63 1
	for _s in `cat $sockfile | tr '\n' ' '` ; do
@


1.10.2.3
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.10.2.4
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/syslogd 175742 2008-01-28 08:22:33Z dougb $
@


1.10.2.3.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.9
log
@The syslogd script should require that /var is cleaned before it runs.
Otherwise it could be in the situation where its log socket is removed
after it has started.

Noticed by: jhay
@
text
@a9 1
# KEYWORD: FreeBSD
@


1.9.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.8
log
@Remove scripts we don't use from requirement lines. These were
hold-overs from the initial NetBSD import.
@
text
@d8 1
a8 1
# REQUIRE: mountcritremote
@


1.7
log
@Make conform to general rc.d style.
@
text
@d8 1
a8 1
# REQUIRE: mountcritremote sysdb wscons
@


1.6
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
@d16 1
a22 2

pidfile="/var/run/syslog.pid"
@


1.5
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
@d23 3
a25 12
case ${OSTYPE} in
FreeBSD)
	pidfile="/var/run/syslog.pid"
	evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
	altlog_proglist="named"
	;;
NetBSD)
	pidfile="/var/run/${name}.pid"
	evalargs="rc_flags=\"-P \$_sockfile \$rc_flags\""
	altlog_proglist="named ntpd"
	;;
esac
@


1.4
log
@test -h is deprecated; use -L instead.

PR:             bin/40846
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD NetBSD
@


1.3
log
@Convert from `${CMD_OSTYPE}` to ${OSTYPE}. This saves a shell invocation on
OS-dependent case switches.
@
text
@d40 1
a40 1
	if [ ! -h /dev/log ]; then
@


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
@d23 1
a23 1
case `${CMD_OSTYPE}` in
@


1.1
log
@Initial revision
@
text
@d3 2
a4 1
# $NetBSD: syslogd,v 1.6 2000/07/29 21:50:20 veego Exp $
d9 2
d15 1
a15 1
rcvar=$name
a16 1
pidfile="/var/run/${name}.pid"
d21 15
d44 24
d71 8
@


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: syslogd,v 1.12 2002/03/22 04:34:00 thorpej Exp $
a7 1
# BEFORE:  SERVERS
a18 2
_sockfile="/var/run/syslogd.sockets"

d26 1
a26 26

	#	Create default list of syslog sockets to watch
	#
	( umask 022 ; > $_sockfile )

	#	Find /etc/rc.d scripts with "chrootdir" rcorder(8) keyword,
	#	and if $${app}_chrootdir is a directory, add appropriate
	#	syslog socket to list of sockets to watch.
	#
	for _lr in $(rcorder -k chrootdir /etc/rc.d/*); do
		_l=${_lr##*/}
		eval _ldir=\$${_l}_chrootdir
		if checkyesno $_l && [ -n "$_ldir" ]; then
			echo "${_ldir}/var/run/log" >> $_sockfile
		fi
	done

	#	If other sockets have been provided, change run_rc_command()'s
	#	internal copy of $syslogd_flags to force use of specific
	#	syslogd sockets.
	#
	if [ -s $_sockfile ]; then
		echo "/var/run/log" >> $_sockfile
		rc_flags="-P $_sockfile $rc_flags"
	fi

@

