head	1.27;
access;
symbols
	RELENG_8_4:1.27.0.2
	RELENG_9_1_0_RELEASE:1.23.4.3.2.2
	RELENG_9_1:1.23.4.3.0.2
	RELENG_9_1_BP:1.23.4.3
	RELENG_8_3_0_RELEASE:1.23.2.3.2.1
	RELENG_8_3:1.23.2.3.0.2
	RELENG_8_3_BP:1.23.2.3
	RELENG_9_0_0_RELEASE:1.23.4.1.2.1
	RELENG_9_0:1.23.4.1.0.2
	RELENG_9_0_BP:1.23.4.1
	RELENG_9:1.23.0.4
	RELENG_9_BP:1.23
	RELENG_7_4_0_RELEASE:1.18.2.4.4.1
	RELENG_8_2_0_RELEASE:1.23.2.1.6.1
	RELENG_7_4:1.18.2.4.0.4
	RELENG_7_4_BP:1.18.2.4
	RELENG_8_2:1.23.2.1.0.6
	RELENG_8_2_BP:1.23.2.1
	RELENG_8_1_0_RELEASE:1.23.2.1.4.1
	RELENG_8_1:1.23.2.1.0.4
	RELENG_8_1_BP:1.23.2.1
	RELENG_7_3_0_RELEASE:1.18.2.4.2.1
	RELENG_7_3:1.18.2.4.0.2
	RELENG_7_3_BP:1.18.2.4
	RELENG_8_0_0_RELEASE:1.23.2.1.2.1
	RELENG_8_0:1.23.2.1.0.2
	RELENG_8_0_BP:1.23.2.1
	RELENG_8:1.23.0.2
	RELENG_8_BP:1.23
	RELENG_7_2_0_RELEASE:1.18.2.3.2.1
	RELENG_7_2:1.18.2.3.0.2
	RELENG_7_2_BP:1.18.2.3
	RELENG_7_1_0_RELEASE:1.18.2.2.2.1
	RELENG_6_4_0_RELEASE:1.15.2.6.2.1
	RELENG_7_1:1.18.2.2.0.2
	RELENG_7_1_BP:1.18.2.2
	RELENG_6_4:1.15.2.6.0.2
	RELENG_6_4_BP:1.15.2.6
	RELENG_7_0_0_RELEASE:1.18.2.1.2.1
	RELENG_6_3_0_RELEASE:1.15.2.3
	RELENG_7_0:1.18.2.1.0.2
	RELENG_7_0_BP:1.18.2.1
	RELENG_6_3:1.15.2.3.0.4
	RELENG_6_3_BP:1.15.2.3
	RELENG_7:1.18.0.2
	RELENG_7_BP:1.18
	RELENG_6_2_0_RELEASE:1.15.2.3
	RELENG_6_2:1.15.2.3.0.2
	RELENG_6_2_BP:1.15.2.3
	RELENG_5_5_0_RELEASE:1.13.2.2
	RELENG_5_5:1.13.2.2.0.2
	RELENG_5_5_BP:1.13.2.2
	RELENG_6_1_0_RELEASE:1.15.2.1
	RELENG_6_1:1.15.2.1.0.2
	RELENG_6_1_BP:1.15.2.1
	RELENG_6_0_0_RELEASE:1.15
	RELENG_6_0:1.15.0.4
	RELENG_6_0_BP:1.15
	RELENG_6:1.15.0.2
	RELENG_6_BP:1.15
	RELENG_5_4_0_RELEASE:1.13.2.1
	RELENG_5_4:1.13.2.1.0.4
	RELENG_5_4_BP:1.13.2.1
	RELENG_5_3_0_RELEASE:1.13.2.1
	RELENG_5_3:1.13.2.1.0.2
	RELENG_5_3_BP:1.13.2.1
	RELENG_5:1.13.0.2
	RELENG_5_BP:1.13
	RELENG_5_2_1_RELEASE:1.9
	RELENG_5_2_0_RELEASE:1.9
	RELENG_5_2:1.9.0.6
	RELENG_5_2_BP:1.9
	RELENG_5_1_0_RELEASE:1.9
	RELENG_5_1:1.9.0.4
	RELENG_5_1_BP:1.9
	RELENG_5_0_0_RELEASE:1.9
	RELENG_5_0:1.9.0.2
	RELENG_5_0_BP:1.9
	head_20020621:1.1.1.2
	head_20010615:1.1.1.1
	NETBSD:1.1.1;
locks; strict;
comment	@# @;


1.27
date	2012.11.17.01.49.04;	author svnexp;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	2012.09.11.05.04.59;	author obrien;	state Exp;
branches;
next	1.25;

1.25
date	2012.02.14.10.51.24;	author dougb;	state Exp;
branches;
next	1.24;

1.24
date	2012.01.14.02.18.41;	author dougb;	state Exp;
branches;
next	1.23;

1.23
date	2009.06.01.04.55.13;	author dougb;	state Exp;
branches
	1.23.2.1
	1.23.4.1;
next	1.22;

1.22
date	2008.07.16.19.50.29;	author dougb;	state Exp;
branches;
next	1.21;

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

1.20
date	2007.10.25.16.59.06;	author mtm;	state Exp;
branches;
next	1.19;

1.19
date	2007.10.19.22.55.42;	author mtm;	state Exp;
branches;
next	1.18;

1.18
date	2006.10.18.15.56.11;	author flz;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	2006.04.11.09.02.06;	author flz;	state Exp;
branches;
next	1.16;

1.16
date	2005.12.30.08.57.33;	author rse;	state Exp;
branches;
next	1.15;

1.15
date	2005.01.16.03.12.03;	author obrien;	state Exp;
branches
	1.15.2.1;
next	1.14;

1.14
date	2004.10.07.13.55.25;	author mtm;	state Exp;
branches;
next	1.13;

1.13
date	2004.03.08.12.25.05;	author pjd;	state Exp;
branches
	1.13.2.1;
next	1.12;

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

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

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

1.9
date	2002.10.12.10.31.31;	author schweikh;	state Exp;
branches;
next	1.8;

1.8
date	2002.09.18.08.49.50;	author rse;	state Exp;
branches;
next	1.7;

1.7
date	2002.09.06.16.18.05;	author gordon;	state Exp;
branches;
next	1.6;

1.6
date	2002.08.14.05.44.32;	author gordon;	state Exp;
branches;
next	1.5;

1.5
date	2002.06.24.19.50.56;	author jdp;	state Exp;
branches;
next	1.4;

1.4
date	2002.06.21.19.50.01;	author dougb;	state Exp;
branches;
next	1.3;

1.3
date	2002.06.20.08.49.44;	author dougb;	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.27.2.1
date	2012.11.17.01.49.04;	author svnexp;	state dead;
branches;
next	1.27.2.2;

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

1.23.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.23.2.1.2.1
	1.23.2.1.4.1
	1.23.2.1.6.1;
next	1.23.2.2;

1.23.2.2
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches;
next	1.23.2.3;

1.23.2.3
date	2012.02.15.23.00.31;	author dougb;	state Exp;
branches
	1.23.2.3.2.1;
next	1.23.2.4;

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

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

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

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

1.23.2.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.23.2.3.2.2;

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

1.23.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.23.4.1.2.1;
next	1.23.4.2;

1.23.4.2
date	2012.02.14.10.16.56;	author dougb;	state Exp;
branches;
next	1.23.4.3;

1.23.4.3
date	2012.02.15.22.59.15;	author dougb;	state Exp;
branches
	1.23.4.3.2.1;
next	1.23.4.4;

1.23.4.4
date	2012.10.26.18.06.49;	author obrien;	state Exp;
branches;
next	1.23.4.5;

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

1.23.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.23.4.1.2.2;

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

1.23.4.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.23.4.3.2.2;

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

1.18.2.1
date	2007.10.28.20.07.29;	author mtm;	state Exp;
branches
	1.18.2.1.2.1;
next	1.18.2.2;

1.18.2.2
date	2008.01.28.07.55.44;	author dougb;	state Exp;
branches
	1.18.2.2.2.1;
next	1.18.2.3;

1.18.2.3
date	2009.03.24.02.48.54;	author dougb;	state Exp;
branches
	1.18.2.3.2.1;
next	1.18.2.4;

1.18.2.4
date	2009.08.03.20.24.31;	author dougb;	state Exp;
branches
	1.18.2.4.2.1
	1.18.2.4.4.1;
next	1.18.2.5;

1.18.2.5
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.18.2.6;

1.18.2.6
date	2012.11.17.08.01.20;	author svnexp;	state Exp;
branches;
next	;

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

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

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

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

1.18.2.4.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.18.2.4.4.2;

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

1.15.2.1
date	2006.01.08.09.20.47;	author rse;	state Exp;
branches;
next	1.15.2.2;

1.15.2.2
date	2006.06.06.09.47.09;	author flz;	state Exp;
branches;
next	1.15.2.3;

1.15.2.3
date	2006.10.22.20.33.10;	author flz;	state Exp;
branches;
next	1.15.2.4;

1.15.2.4
date	2008.01.28.08.06.17;	author dougb;	state Exp;
branches;
next	1.15.2.5;

1.15.2.5
date	2008.01.28.08.08.38;	author dougb;	state Exp;
branches;
next	1.15.2.6;

1.15.2.6
date	2008.01.28.08.22.32;	author dougb;	state Exp;
branches
	1.15.2.6.2.1;
next	1.15.2.7;

1.15.2.7
date	2009.08.03.20.26.55;	author dougb;	state Exp;
branches;
next	1.15.2.8;

1.15.2.8
date	2012.11.17.07.39.06;	author svnexp;	state Exp;
branches;
next	;

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

1.13.2.1
date	2004.10.10.09.50.53;	author mtm;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	2006.01.14.08.33.33;	author rse;	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.27
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/amd 240336 2012-09-11 05:04:59Z obrien $
#

# PROVIDE: amd
# REQUIRE: rpcbind ypset nfsclient FILESYSTEMS ldconfig
# BEFORE: DAEMON
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="amd"
rcvar="amd_enable"
command="/usr/sbin/${name}"
start_precmd="amd_precmd"
command_args="&"
extra_commands="reload"

amd_precmd()
{
	force_depend nfsclient nfs_client || return 1
	force_depend rpcbind || return 1

	case ${amd_map_program} in
	[Nn][Oo] | '')
		;;
	*)
		rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
		;;
	esac

	case "${amd_flags}" in
	'')
		if [ ! -r /etc/amd.conf ]; then
			warn 'amd will not load without arguments'
			return 1
		fi
		;;
	*)
		rc_flags="-p ${rc_flags}"
		command_args="> /var/run/amd.pid 2> /dev/null"
		;;
	esac
}

load_rc_config $name
run_rc_command "$1"
@


1.27.2.1
log
@file amd was added on branch RELENG_8_4 on 2013-03-28 13:02:43 +0000
@
text
@d1 48
@


1.27.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 48
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/amd 231793 2012-02-15 23:00:31Z dougb $
#

# PROVIDE: amd
# REQUIRE: rpcbind ypset nfsclient cleanvar ldconfig
# BEFORE: DAEMON
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="amd"
rcvar="amd_enable"
command="/usr/sbin/${name}"
start_precmd="amd_precmd"
command_args="&"
extra_commands="reload"

amd_precmd()
{
	force_depend nfsclient nfs_client || return 1
	force_depend rpcbind || return 1

	case ${amd_map_program} in
	[Nn][Oo] | '')
		;;
	*)
		rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
		;;
	esac

	case "${amd_flags}" in
	'')
		if [ ! -r /etc/amd.conf ]; then
			warn 'amd will not load without arguments'
			return 1
		fi
		;;
	*)
		rc_flags="-p ${rc_flags}"
		command_args="> /var/run/amd.pid 2> /dev/null"
		;;
	esac
}

load_rc_config $name
run_rc_command "$1"
@


1.26
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.25
log
@SVN rev 231667 on 2012-02-14 10:51:24Z by dougb

Fix various issues with the NFS and RPC related scripts:

1. Add new functionality to the force_depend method to incorporate the
   tests for whether the service is enabled and/or already running.
2. Add a new option to bypass checking only that the service is enabled
   at boot time, and always check if it is running.
3. Use this new functionality to greatly simplify the rc.d scripts that
   use force_depend.
4. Add a force_depend for statd in lockd
5. Remove the check that either nfs_server or nfs_client is _enable'd
   from statd and lockd. This was always overkill, and prevented using
   the {one|force}start options, as well as stop'ing on the command line.
6. The yp* scripts had some of their arguments in various weird orders.
   Bring them into line with the model.
7. If mountd fails to create /var/db/mountdtab, err out.

Ideas, suggestions, and/or review from delphij and jilles.
Pointy hats are completely my responsibility however.
@
text
@d7 1
a7 1
# REQUIRE: rpcbind ypset nfsclient cleanvar ldconfig
@


1.24
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
@d22 2
a23 9
	if ! checkyesno nfs_client_enable; then
		force_depend nfsclient || return 1
	fi

	if ! checkyesno rpcbind_enable  && \
	    ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
	then
		force_depend rpcbind || return 1
	fi
a44 1
	return 0
@


1.23
log
@SVN rev 193197 on 2009-06-01 04:55:13Z by dougb

Substitute ypset for ypbind in REQUIRE lines. If you use ypset it has to
happen right after ypbind, and before anything that uses NIS. The only
change in rcorder accomplished by this patch is make that happen.

PR:		conf/117555
Submitted by:	John Marshall <john@@rwsrv05.mby.riverwillow.net.au>
@
text
@d14 1
a14 1
rcvar=`set_rcvar`
@


1.23.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.23.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
@d14 1
a14 1
rcvar="amd_enable"
@


1.23.4.3
log
@SVN rev 231792 on 2012-02-15 22:59:15Z by dougb

MFC r231667:

Fix various issues with the NFS and RPC related scripts.
Add new functionality to the force_depend method.
@
text
@d22 9
a30 2
	force_depend nfsclient nfs_client || return 1
	force_depend rpcbind || return 1
d52 1
@


1.23.4.4
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: rpcbind ypset nfsclient FILESYSTEMS ldconfig
@


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


1.23.4.3.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.23.4.3.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/amd 231792 2012-02-15 22:59:15Z dougb $
@


1.23.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.23.4.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/amd 193197 2009-06-01 04:55:13Z dougb $
@


1.23.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.23.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
@d14 1
a14 1
rcvar="amd_enable"
@


1.23.2.3
log
@SVN rev 231793 on 2012-02-15 23:00:31Z by dougb

MFC r231667:

Fix various issues with the NFS and RPC related scripts.
Add new functionality to the force_depend method.
@
text
@d22 9
a30 2
	force_depend nfsclient nfs_client || return 1
	force_depend rpcbind || return 1
d52 1
@


1.23.2.4
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/amd 231793 2012-02-15 23:00:31Z dougb $
@


1.23.2.3.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.23.2.3.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/amd 231793 2012-02-15 23:00:31Z dougb $
@


1.23.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.23.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.23.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.22
log
@SVN rev 180564 on 2008-07-16 19:50:29Z by dougb

Add the shutdown KEYWORD to those scripts that start persistent services
to allow them to do a "clean" shutdown.

I purposely avoided making changes to network-related stuff since the
system shutting down is pretty conclusive, and there may be complicated
dependencies on the network that I would rather not try to unravel.

I also skipped kerberos-related stuff for the reasons above, and
because I have no way to test it.
@
text
@d7 1
a7 1
# REQUIRE: rpcbind ypbind nfsclient cleanvar ldconfig
@


1.21
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
@d9 1
a9 1
# KEYWORD: nojail
@


1.20
log
@Remove unnecessary whitespace
@
text
@a2 1
# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
@


1.19
log
@The amd_map_program knob can potentially contain a command whose output
is then used as an argument to the amd program. This outpu may contain
newlines, but the script did not take care to strip those newlines before
apending it to rc_flags. Revision 1.72 of rc.subr(8) introduced changes that
exposed this problem (specifically putting the final eval'ed command in
quotes).[1]

Also, for correctness' sake, shell directives appended to the command-line
by the script should go into command_args, and not appended directly
to rc_flags.

Reported by:	John E Hein <jhein@@timing.com> [1]
Tested by:	John E Hein <jhein@@timing.com>
MFC after:	1 week
@
text
@d50 1
a50 1
		command_args=" > /var/run/amd.pid 2> /dev/null"
@


1.18
log
@Add 'reload' to the list of available commands for the amd rc.d script.

PR:		conf/104507
Submitted by:	Douglas K. Rand <rand@@meridian-enviro.com>
MFC after:	3 days
@
text
@d37 1
a37 1
		rc_flags="${rc_flags} `eval ${amd_map_program}`"
d49 2
a50 1
		rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null"
@


1.18.2.1
log
@MFC: rev. 1.19 and 1.20
   The amd_map_program knob can potentially contain a command whose output
   is then used as an argument to the amd program. This outpu may contain
   newlines, but the script did not take care to strip those newlines before
   apending it to rc_flags. Revision 1.72 of rc.subr(8) introduced changes that
   exposed this problem (specifically putting the final eval'ed command in
   quotes).[1]

   Also, for correctness' sake, shell directives appended to the command-line
   by the script should go into command_args, and not appended directly
   to rc_flags.

Approved by: re (kensmith)
@
text
@d37 1
a37 1
		rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
d49 1
a49 2
		rc_flags="-p ${rc_flags}"
		command_args="> /var/run/amd.pid 2> /dev/null"
@


1.18.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.18.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.18.2.3
log
@SVN rev 190362 on 2009-03-24 02:48:54Z by dougb

MFC r180564, addition of the SHUTDOWN keyword to those scripts that
start persistent services.
@
text
@d9 1
a9 1
# KEYWORD: nojail shutdown
@


1.18.2.4
log
@SVN rev 196057 on 2009-08-03 20:24:31Z by dougb

MFC r193197, substitute ypset for ypbind in REQUIRE lines.
@
text
@d7 1
a7 1
# REQUIRE: rpcbind ypset nfsclient cleanvar ldconfig
@


1.18.2.5
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
@d14 1
a14 1
rcvar="amd_enable"
@


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


1.18.2.4.4.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.18.2.4.4.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/amd 196057 2009-08-03 20:24:31Z dougb $
@


1.18.2.4.2.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.18.2.3.2.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.18.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.17
log
@- Fix amd startup when amd is installed from ports.
- Add the according amd_program default value in defaults.

PR:		conf/82738
Submitted by:	TAOKA Fumiyoshi <fmysh@@iijmio-mail.jp>
Approved by:	cperciva (mentor)
MFC after:	3 days
@
text
@d19 1
@


1.16
log
@Remove superfluous line continuation backslash.

MFC after: 3 days
@
text
@d8 1
a8 1
# REQUIRE: rpcbind ypbind nfsclient cleanvar
@


1.15
log
@"REQUIRE: cleanvar" for all RC's writing into /var/run.
@
text
@d48 1
a48 1
		rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null" \
@


1.15.2.1
log
@MFC r1.16:

Remove superfluous line continuation backslash.
@
text
@d48 1
a48 1
		rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null"
@


1.15.2.2
log
@MFC:

  - Fix amd startup when amd is installed from ports.
  - Add the according amd_program default value in defaults.

      src/etc/rc.d/amd: rev 1.16 -> 1.17
      src/etc/defaults/rc.conf: rev 1.277 -> 1.278

PR:		conf/82738
Submitted by:	TAOKA Fumiyoshi <fmysh@@iijmio-mail.jp>
@
text
@d8 1
a8 1
# REQUIRE: rpcbind ypbind nfsclient cleanvar ldconfig
@


1.15.2.3
log
@MFC: Add 'reload' to the list of available commands for the amd rc.d script.

      src/etc/rc.d/amd: rev 1.17 -> 1.18

PR:		conf/104507
Submitted by:	Douglas K. Rand <rand@@meridian-enviro.com>
Approved by:	re (bmah)
@
text
@a18 1
extra_commands="reload"
@


1.15.2.4
log
@MFC version 1.19, better handling of amd_map_program and move of
the pid to command_args.
@
text
@d37 1
a37 1
		rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
d49 1
a49 2
		rc_flags="-p ${rc_flags}"
		command_args=" > /var/run/amd.pid 2> /dev/null"
@


1.15.2.5
log
@MFC 1.20, removal of unnecessary whitespace.
@
text
@d50 1
a50 1
		command_args="> /var/run/amd.pid 2> /dev/null"
@


1.15.2.6
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.15.2.7
log
@SVN rev 196058 on 2009-08-03 20:26:55Z by dougb

MFC r193197, substitute ypset for ypbind in REQUIRE lines.
@
text
@d7 1
a7 1
# REQUIRE: rpcbind ypset nfsclient cleanvar ldconfig
@


1.15.2.8
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/amd 196058 2009-08-03 20:26:55Z dougb $
@


1.15.2.6.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.14
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: rpcbind ypbind nfsclient
@


1.13
log
@Mark scripts as not usable inside a jail by adding keyword 'nojail'.

Some suggestions from:	rwatson, Ruben de Groot <mail25@@bzerk.org>
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD nojail
@


1.13.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
a10 1
# KEYWORD: nojail
@


1.13.2.2
log
@MFC r1.16:

Remove superfluous line continuation backslash.
@
text
@d48 1
a48 1
		rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null"
@


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


1.11
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: rpcbind mountall ypbind nfsclient
@


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, begin removal
of NetBSD specific stuff (which made our scripts more complicated
than necessary), starting with the NetBSD KEYWORD.
@
text
@d17 2
a18 13

case ${OSTYPE} in
FreeBSD)
	start_precmd="amd_precmd"
	command_args="&"
	;;
NetBSD)
	command_args='-p -a '$amd_dir' -F /etc/amd.conf >/var/run/amd.pid'
	required_dirs="$amd_dir"
	required_files="/etc/amd.conf"
	required_vars="rpcbind"
	;;
esac
d22 3
a24 5
	case ${OSTYPE} in
	FreeBSD)
		if ! checkyesno nfs_client_enable; then
			force_depend nfsclient || return 1
		fi
d26 5
a30 5
		if ! checkyesno rpcbind_enable  && \
		    ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
		then
			force_depend rpcbind || return 1
		fi
d32 7
a38 7
		case ${amd_map_program} in
		[Nn][Oo] | '')
			;;
		*)
			rc_flags="${rc_flags} `eval ${amd_map_program}`"
			;;
		esac
d40 9
a48 11
		case "${amd_flags}" in
		'')
			if [ ! -r /etc/amd.conf ]; then
				warn 'amd will not load without arguments'
				return 1
			fi
			;;
		*)
			rc_flags="-p ${rc_flags} > /var/run/amd.pid 2> /dev/null" \
			;;
		esac
@


1.9
log
@Fix style bugs:
* Space -> tabs conversion.
* Removed blanks before semicolon in "if ... ; then".
* Proper indentation of misindented lines.
* Put a full stop after some comments.
* Removed whitespace at end of line.

Approved by:	silence from gordon
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD NetBSD
@


1.8
log
@Fix implementation of rc variables $amd_flags and $amd_map_program in
rcNG. The $amd_flags variable was already taken over into $rc_flags
by run_rc_command() when amd_precmd() is executed, so changing
$amd_flags there no longer effects the actual execution of amd.
Hence in amd_precmd() the $rc_flags have to be adjusted instead.
@
text
@d31 1
a31 1
amd_precmd() 
d35 1
a35 1
		if ! checkyesno nfs_client_enable ; then
d41 1
a41 1
                then
@


1.7
log
@Convert from `${CMD_OSTYPE}` to ${OSTYPE}. This saves a shell invocation on
OS-dependent case switches.
@
text
@d49 1
a49 1
			amd_flags="${amd_flags} `eval ${amd_map_program}`"
d61 1
a61 1
			amd_flags="-p ${amd_flags} > /var/run/amd.pid 2> /dev/null" \
@


1.6
log
@Clean up the scripts to use the new variables:
xntpd_* -> ntpd_*
portmap_* -> rpcbind_*

Also change single_mountd_enable -> mountd_enable
Changing the mountd flags brings us closer to NetBSD.

All of the old variable names are shimmed so you can continue to use the
old variable name.

Finally make /etc/rc.d/mountd no longer dependent on nfs as there are
(apparently) other consumers of mountd.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
@
text
@d18 1
a18 1
case `${CMD_OSTYPE}` in
d33 1
a33 1
	case `${CMD_OSTYPE}` in
@


1.5
log
@Fix the amd invocation to honor the amd_flags setting.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
@
text
@d39 1
a39 1
		if ! checkyesno portmap_enable  && \
@


1.4
log
@Hone the rpcbind dependency checking.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
@
text
@a19 1
	start_cmd="echo 'Starting amd.'; /usr/sbin/${name} &"
d21 1
@


1.3
log
@Anonymize the "portmap" program to get better compatibility with
rpcbind in -current.

Submitted by:	Alexander Kabaev <ak03@@gte.com>
@
text
@d16 1
a27 1
	command="/usr/sbin/${name}"
d40 1
a40 1
		   [ -z "`check_process ${portmap_program}`" ]
@


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
@d38 4
a41 2
		if [ -z "`check_process rpcbind`" \
	    	    -a ! `checkyesno portmap_enable` ]; then
@


1.1
log
@Initial revision
@
text
@d3 2
a4 1
# $NetBSD: amd,v 1.6 2000/09/19 13:04:38 lukem Exp $
d8 3
a10 1
# REQUIRE: rpcbind mountall ypbind
d15 35
a49 3
rcvar=$name
command="/usr/sbin/${name}"
load_rc_config $name
d51 15
a65 4
command_args='-p -a '$amd_dir' -F /etc/amd.conf >/var/run/amd.pid'
required_files="/etc/amd.conf"
required_dirs="$amd_dir"
required_vars="rpcbind"
d67 1
@


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: amd,v 1.9 2002/03/22 04:33:58 thorpej Exp $
a7 1
# BEFORE:  DAEMON
@

