head	1.12;
access;
symbols
	RELENG_8_4:1.12.0.2
	RELENG_9_1_0_RELEASE:1.9.16.1.4.2
	RELENG_9_1:1.9.16.1.0.4
	RELENG_9_1_BP:1.9.16.1
	RELENG_8_3_0_RELEASE:1.9.10.1.8.1
	RELENG_8_3:1.9.10.1.0.8
	RELENG_8_3_BP:1.9.10.1
	RELENG_9_0_0_RELEASE:1.9.16.1.2.1
	RELENG_9_0:1.9.16.1.0.2
	RELENG_9_0_BP:1.9.16.1
	RELENG_9:1.9.0.16
	RELENG_9_BP:1.9
	RELENG_7_4_0_RELEASE:1.9.14.1
	RELENG_8_2_0_RELEASE:1.9.10.1.6.1
	RELENG_7_4:1.9.0.14
	RELENG_7_4_BP:1.9
	RELENG_8_2:1.9.10.1.0.6
	RELENG_8_2_BP:1.9.10.1
	RELENG_8_1_0_RELEASE:1.9.10.1.4.1
	RELENG_8_1:1.9.10.1.0.4
	RELENG_8_1_BP:1.9.10.1
	RELENG_7_3_0_RELEASE:1.9.12.1
	RELENG_7_3:1.9.0.12
	RELENG_7_3_BP:1.9
	RELENG_8_0_0_RELEASE:1.9.10.1.2.1
	RELENG_8_0:1.9.10.1.0.2
	RELENG_8_0_BP:1.9.10.1
	RELENG_8:1.9.0.10
	RELENG_8_BP:1.9
	RELENG_7_2_0_RELEASE:1.9.8.1
	RELENG_7_2:1.9.0.8
	RELENG_7_2_BP:1.9
	RELENG_7_1_0_RELEASE:1.9.6.1
	RELENG_6_4_0_RELEASE:1.8.2.1.4.1
	RELENG_7_1:1.9.0.6
	RELENG_7_1_BP:1.9
	RELENG_6_4:1.8.2.1.0.4
	RELENG_6_4_BP:1.8.2.1
	RELENG_7_0_0_RELEASE:1.9
	RELENG_6_3_0_RELEASE:1.8.2.1
	RELENG_7_0:1.9.0.4
	RELENG_7_0_BP:1.9
	RELENG_6_3:1.8.2.1.0.2
	RELENG_6_3_BP:1.8.2.1
	RELENG_7:1.9.0.2
	RELENG_7_BP:1.9
	RELENG_6_2_0_RELEASE:1.8
	RELENG_6_2:1.8.0.8
	RELENG_6_2_BP:1.8
	RELENG_5_5_0_RELEASE:1.6.2.2
	RELENG_5_5:1.6.2.2.0.2
	RELENG_5_5_BP:1.6.2.2
	RELENG_6_1_0_RELEASE:1.8
	RELENG_6_1:1.8.0.6
	RELENG_6_1_BP:1.8
	RELENG_6_0_0_RELEASE:1.8
	RELENG_6_0:1.8.0.4
	RELENG_6_0_BP:1.8
	RELENG_6:1.8.0.2
	RELENG_6_BP:1.8
	RELENG_5_4_0_RELEASE:1.6.2.1.4.1
	RELENG_5_4:1.6.2.1.0.4
	RELENG_5_4_BP:1.6.2.1
	RELENG_5_3_0_RELEASE:1.6.2.1
	RELENG_5_3:1.6.2.1.0.2
	RELENG_5_3_BP:1.6.2.1
	RELENG_5:1.6.0.2
	RELENG_5_BP:1.6
	RELENG_5_2_1_RELEASE:1.3
	RELENG_5_2_0_RELEASE:1.3
	RELENG_5_2:1.3.0.4
	RELENG_5_2_BP:1.3
	RELENG_5_1_0_RELEASE:1.3
	RELENG_5_1:1.3.0.2
	RELENG_5_1_BP:1.3
	RELENG_5_0_0_RELEASE:1.2
	RELENG_5_0:1.2.0.2
	RELENG_5_0_BP:1.2;
locks; strict;
comment	@# @;


1.12
date	2012.11.17.01.49.05;	author svnexp;	state Exp;
branches
	1.12.2.1;
next	1.11;

1.11
date	2012.09.11.05.04.59;	author obrien;	state Exp;
branches;
next	1.10;

1.10
date	2012.08.22.18.43.21;	author obrien;	state Exp;
branches;
next	1.9;

1.9
date	2007.03.03.06.39.06;	author njl;	state Exp;
branches
	1.9.2.1
	1.9.6.1
	1.9.8.1
	1.9.10.1
	1.9.12.1
	1.9.14.1
	1.9.16.1;
next	1.8;

1.8
date	2005.04.11.02.45.05;	author dougb;	state Exp;
branches
	1.8.2.1;
next	1.7;

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

1.6
date	2004.04.12.18.11.00;	author brooks;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2004.03.08.12.25.05;	author pjd;	state Exp;
branches;
next	1.4;

1.4
date	2004.02.07.23.13.28;	author johan;	state Exp;
branches;
next	1.3;

1.3
date	2003.04.18.17.55.05;	author mtm;	state Exp;
branches;
next	1.2;

1.2
date	2002.10.12.10.31.31;	author schweikh;	state Exp;
branches;
next	1.1;

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

1.12.2.1
date	2012.11.17.01.49.05;	author svnexp;	state dead;
branches;
next	1.12.2.2;

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

1.9.2.1
date	2012.11.17.08.01.22;	author svnexp;	state Exp;
branches;
next	;

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

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

1.9.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.9.10.1.2.1
	1.9.10.1.4.1
	1.9.10.1.6.1
	1.9.10.1.8.1;
next	1.9.10.2;

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

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

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

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

1.9.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.9.10.1.8.2;

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

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

1.9.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.9.14.2;

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

1.9.16.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.9.16.1.2.1
	1.9.16.1.4.1;
next	1.9.16.2;

1.9.16.2
date	2012.10.26.18.06.49;	author obrien;	state Exp;
branches;
next	1.9.16.3;

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

1.9.16.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.9.16.1.2.2;

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

1.9.16.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.9.16.1.4.2;

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

1.8.2.1
date	2007.03.18.05.34.47;	author njl;	state Exp;
branches
	1.8.2.1.4.1;
next	1.8.2.2;

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

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

1.6.2.1
date	2004.10.10.09.50.54;	author mtm;	state Exp;
branches
	1.6.2.1.4.1;
next	1.6.2.2;

1.6.2.2
date	2005.04.14.21.58.55;	author dougb;	state Exp;
branches;
next	;

1.6.2.1.4.1
date	2005.04.14.21.57.33;	author dougb;	state Exp;
branches;
next	;


desc
@@


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

# PROVIDE: random
# REQUIRE: initrandom FILESYSTEMS
# BEFORE: netif
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="random"
start_cmd="random_start"
stop_cmd="random_stop"

extra_commands="saveseed"
saveseed_cmd="${name}_stop"

feed_dev_random()
{
	if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then
		cat "${1}" | dd of=/dev/random bs=8k 2>/dev/null
	fi
}

random_start()
{
	# Reseed /dev/random with previously stored entropy.
	case ${entropy_dir} in
	[Nn][Oo])
		;;
	*)
		entropy_dir=${entropy_dir:-/var/db/entropy}
		if [ -d "${entropy_dir}" ]; then
			if [ -w /dev/random ]; then
				for seedfile in ${entropy_dir}/*; do
					feed_dev_random "${seedfile}"
				done
			fi
		fi
		;;
	esac

	case ${entropy_file} in
	[Nn][Oo] | '')
		;;
	*)
		if [ -w /dev/random ]; then
			feed_dev_random "${entropy_file}"
			feed_dev_random /var/db/entropy-file
		fi
		;;
	esac
}

random_stop()
{
	# Write some entropy so when the machine reboots /dev/random
	# can be reseeded
	#
	case ${entropy_file} in
	[Nn][Oo] | '')
		;;
	*)
		echo -n 'Writing entropy file:'
		rm -f ${entropy_file} 2> /dev/null
		oumask=`umask`
		umask 077
		if touch ${entropy_file} 2> /dev/null; then
			entropy_file_confirmed="${entropy_file}"
		else
			# Try this as a reasonable alternative for read-only
			# roots, diskless workstations, etc.
			rm -f /var/db/entropy-file 2> /dev/null
			if touch /var/db/entropy-file 2> /dev/null; then
				entropy_file_confirmed=/var/db/entropy-file
			fi
		fi
		case ${entropy_file_confirmed} in
		'')
			warn 'write failed (read-only fs?)'
			;;
		*)
			dd if=/dev/random of=${entropy_file_confirmed} \
			   bs=4096 count=1 2> /dev/null
			echo '.'
			;;
		esac
		umask ${oumask}
		;;
	esac
}

load_rc_config $name
run_rc_command "$1"
@


1.12.2.1
log
@file random was added on branch RELENG_8_4 on 2013-03-28 13:02:44 +0000
@
text
@d1 96
@


1.12.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 93
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/random 180563 2008-07-16 19:22:48Z dougb $
#

# PROVIDE: random
# REQUIRE: var initrandom
# BEFORE: netif
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="random"
start_cmd="random_start"
stop_cmd="random_stop"

feed_dev_random()
{
	if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then
		cat "${1}" | dd of=/dev/random bs=8k 2>/dev/null
	fi
}

random_start()
{
	# Reseed /dev/random with previously stored entropy.
	case ${entropy_dir} in
	[Nn][Oo])
		;;
	*)
		entropy_dir=${entropy_dir:-/var/db/entropy}
		if [ -d "${entropy_dir}" ]; then
			if [ -w /dev/random ]; then
				for seedfile in ${entropy_dir}/*; do
					feed_dev_random "${seedfile}"
				done
			fi
		fi
		;;
	esac

	case ${entropy_file} in
	[Nn][Oo] | '')
		;;
	*)
		if [ -w /dev/random ]; then
			feed_dev_random "${entropy_file}"
			feed_dev_random /var/db/entropy-file
		fi
		;;
	esac
}

random_stop()
{
	# Write some entropy so when the machine reboots /dev/random
	# can be reseeded
	#
	case ${entropy_file} in
	[Nn][Oo] | '')
		;;
	*)
		echo -n 'Writing entropy file:'
		rm -f ${entropy_file} 2> /dev/null
		oumask=`umask`
		umask 077
		if touch ${entropy_file} 2> /dev/null; then
			entropy_file_confirmed="${entropy_file}"
		else
			# Try this as a reasonable alternative for read-only
			# roots, diskless workstations, etc.
			rm -f /var/db/entropy-file 2> /dev/null
			if touch /var/db/entropy-file 2> /dev/null; then
				entropy_file_confirmed=/var/db/entropy-file
			fi
		fi
		case ${entropy_file_confirmed} in
		'')
			warn 'write failed (read-only fs?)'
			;;
		*)
			dd if=/dev/random of=${entropy_file_confirmed} \
			   bs=4096 count=1 2> /dev/null
			echo '.'
			;;
		esac
		umask ${oumask}
		;;
	esac
}

load_rc_config $name
run_rc_command "$1"
@


1.11
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.10
log
@SVN rev 239569 on 2012-08-22 18:43:21Z by obrien

Remove old entropy seeding after consumption initializing /dev/random PRNG.
Not doing so opens us up to replay attacks.

Submitted by:	Arthur Mesh <arthurmesh@@gmail.com>
Sponsored by:	Juniper Networks
@
text
@d7 1
a7 1
# REQUIRE: initrandom var
@


1.9
log
@Get rid of chatter for failed commands if the filesystem is read-only.
Include /var/db/entropy-file in the reseeding if present.  It is used for
last-ditch efforts to save entropy and thus should also be used to seed
the RNG when starting.  Print a warning instead of an error if writing the
file fails -- err() exits, preventing the umask from being restored.
Also, since there's not much that can be done about it, notifying the user
is all that's needed.

MFC after:	2 weeks
@
text
@d7 1
a7 1
# REQUIRE: var initrandom
d17 3
@


1.9.2.1
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/random 220110 2011-03-28 19:29:30Z dougb $
@


1.9.16.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.9.16.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: initrandom FILESYSTEMS
@


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


1.9.16.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.9.16.1.4.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/random 180563 2008-07-16 19:22:48Z dougb $
@


1.9.16.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.9.16.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/random 180563 2008-07-16 19:22:48Z dougb $
@


1.9.14.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.9.14.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/random 167185 2007-03-03 06:39:06Z njl $
@


1.9.12.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.9.10.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.9.10.2
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/random 180563 2008-07-16 19:22:48Z dougb $
@


1.9.10.1.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.9.10.1.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/random 180563 2008-07-16 19:22:48Z dougb $
@


1.9.10.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.9.10.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.9.10.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.9.8.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.9.6.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.8
log
@The alternative suggested for /entropy as a shutdown
save file was /var/db/entropy, which also happens to
be the directory where the individual entropy files
created by /usr/libexec/save-entropy are stored.
Change the suggestion to be /var/db/entropy-file
instead.

In an error condition where the shutdown file is not
created, the error message accessed a variable that
doesn't exist.

PR:		conf/75722
Submitted by:	Nicolas Rachinsky <list@@rachinsky.de>
@
text
@d48 1
d64 1
a64 1
		rm -f ${entropy_file}
d67 1
a67 1
		if touch ${entropy_file}; then
d72 2
a73 2
			rm -f /var/db/entropy-file
			if touch /var/db/entropy-file; then
d79 1
a79 1
			err 1 'entropy file write failed.'
@


1.8.2.1
log
@MFC rev 1.9: quiet down the errors when all fs are read-only
@
text
@a47 1
			feed_dev_random /var/db/entropy-file
d63 1
a63 1
		rm -f ${entropy_file} 2> /dev/null
d66 1
a66 1
		if touch ${entropy_file} 2> /dev/null; then
d71 2
a72 2
			rm -f /var/db/entropy-file 2> /dev/null
			if touch /var/db/entropy-file 2> /dev/null; then
d78 1
a78 1
			warn 'write failed (read-only fs?)'
@


1.8.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/random 167674 2007-03-18 05:34:47Z njl $
@


1.8.2.1.4.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.7
log
@Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@d71 3
a73 3
			rm -f /var/db/entropy
			if touch /var/db/entropy; then
				entropy_file_confirmed=/var/db/entropy
d78 1
a78 2
			err 1 '${entropy_file_confirmed}:' \
			    ' entropy file write failed.'
@


1.6
log
@Catch up with diskless split "diskless" is no longer provided.

Suggested by:	cperciva
@
text
@d9 1
a9 1
# KEYWORD: FreeBSD nojail shutdown
@


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


1.6.2.2
log
@MFC fixes for rc.d/random:
/var/db/entropy -> /var/db/entropy-file, and
Fix error message when save fails.

Approved by:	re (kensmith)
@
text
@d71 3
a73 3
			rm -f /var/db/entropy-file
			if touch /var/db/entropy-file; then
				entropy_file_confirmed=/var/db/entropy-file
d78 2
a79 1
			err 1 'entropy file write failed.'
@


1.6.2.1.4.1
log
@MFC fixes for rc.d/random:
/var/db/entropy -> /var/db/entropy-file, and
Fix error message when save fails.

Approved by:	re (kensmith)
@
text
@d71 3
a73 3
			rm -f /var/db/entropy-file
			if touch /var/db/entropy-file; then
				entropy_file_confirmed=/var/db/entropy-file
d78 2
a79 1
			err 1 'entropy file write failed.'
@


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

Some suggestions from:	rwatson, Ruben de Groot <mail25@@bzerk.org>
@
text
@d7 1
a7 1
# REQUIRE: diskless mountcritlocal initrandom
@


1.4
log
@Fix typo in comment, s/reebots/reboots/

PR:		62481
Submitted by:	Ulrich Spoerlein <q at uni.de>
@
text
@d9 1
a9 1
# KEYWORD: FreeBSD shutdown
@


1.3
log
@o Hook the new files up to the build.
o Make sure all the scripts reference rc.d/netif and not rc.d/network1

Approved by:	markm (mentor)
@
text
@d55 1
a55 1
	# Write some entropy so when the machine reebots /dev/random
@


1.2
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
@d8 1
a8 1
# BEFORE: network1
@


1.1
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
@d66 1
a66 1
		if touch ${entropy_file} ; then
d72 1
a72 1
			if touch /var/db/entropy ; then
@

