From 283b4f069e9e757970a78ffdc512cd191f20c47d Mon Sep 17 00:00:00 2001
From: Robert Garrett <rob@dragonflybsd.org>
Date: Tue, 27 Jan 2004 00:42:46 +0000
Subject: [PATCH] update rcng to remove FreeBSD and NetBSD

---
 etc/rc.d/local           |   4 +-
 etc/rc.d/localdaemons    |   4 +-
 etc/rc.d/lpd             |  12 +---
 etc/rc.d/motd            |  37 ++-----------
 etc/rc.d/mountcritlocal  |  90 ++++++++----------------------
 etc/rc.d/mountcritremote | 116 ++++++++++-----------------------------
 etc/rc.d/mountd          |  57 ++++++-------------
 etc/rc.d/moused          |  14 +----
 etc/rc.d/mroute6d        |   4 +-
 etc/rc.d/mrouted         |   4 +-
 etc/rc.d/msgs            |   4 +-
 etc/rc.d/named           |  78 +++++---------------------
 etc/rc.d/netif           |   4 +-
 etc/rc.d/netoptions      |   4 +-
 etc/rc.d/network1        |   4 +-
 etc/rc.d/network2        |   4 +-
 etc/rc.d/network3        |   4 +-
 etc/rc.d/network_ipv6    |   4 +-
 etc/rc.d/nfsclient       |   4 +-
 etc/rc.d/nfsd            |  24 ++------
 etc/rc.d/nfslocking      |  28 ++--------
 etc/rc.d/nfsserver       |   4 +-
 etc/rc.d/nisdomain       |   4 +-
 etc/rc.d/ntpd            |  11 +---
 etc/rc.d/othermta        |   4 +-
 etc/rc.d/pccard          |   4 +-
 etc/rc.d/pcvt            |   4 +-
 etc/rc.d/ppp-user        |   4 +-
 etc/rc.d/pppoed          |   4 +-
 etc/rc.d/pwcheck         |   4 +-
 etc/rc.d/quota           |   4 +-
 etc/rc.d/random          |   4 +-
 etc/rc.d/rarpd           |   4 +-
 etc/rc.d/rcconf.sh       |   4 +-
 etc/rc.d/root            |  69 ++++++-----------------
 etc/rc.d/route6d         |  24 ++------
 etc/rc.d/routed          |  25 ++-------
 etc/rc.d/routing         |   4 +-
 etc/rc.d/rtadvd          |  83 +++++++---------------------
 etc/rc.d/rwho            |   4 +-
 etc/rc.d/savecore        |  79 +++++++-------------------
 etc/rc.d/securelevel     |  49 +++--------------
 42 files changed, 235 insertions(+), 665 deletions(-)

diff --git a/etc/rc.d/local b/etc/rc.d/local
index ebaeb71e1a..918a5e848e 100644
--- a/etc/rc.d/local
+++ b/etc/rc.d/local
@@ -2,13 +2,13 @@
 #
 # $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/local,v 1.4 2002/10/17 23:46:32 sobomax Exp $
-# $DragonFly: src/etc/rc.d/local,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/local,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: local
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly FreeBSD NetBSD shutdown
+# KEYWORD: DragonFly shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/localdaemons b/etc/rc.d/localdaemons
index d9c2c573dc..a5bc2110da 100644
--- a/etc/rc.d/localdaemons
+++ b/etc/rc.d/localdaemons
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $
-# $DragonFly: src/etc/rc.d/localdaemons,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/localdaemons,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: localdaemons
 # REQUIRE: abi
 # BEFORE:  securelevel
-# KEYWORD: DragonFly FreeBSD shutdown
+# KEYWORD: DragonFly  shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/lpd b/etc/rc.d/lpd
index a31a0e944a..e38da5b17e 100644
--- a/etc/rc.d/lpd
+++ b/etc/rc.d/lpd
@@ -2,13 +2,13 @@
 #
 # $NetBSD: lpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/lpd,v 1.3 2002/09/06 16:18:05 gordon Exp $
-# $DragonFly: src/etc/rc.d/lpd,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/lpd,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: lpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -17,13 +17,5 @@ rcvar=`set_rcvar`
 command="/usr/sbin/${name}"
 required_files="/etc/printcap"
 
-case ${OSTYPE} in
-NetBSD)
-	pidfile="/var/run/${name}.pid"
-	;;
-*)
-	;;
-esac
-
 load_rc_config $name
 run_rc_command "$1"
diff --git a/etc/rc.d/motd b/etc/rc.d/motd
index 986cba17f6..4e988e00a8 100644
--- a/etc/rc.d/motd
+++ b/etc/rc.d/motd
@@ -2,13 +2,13 @@
 #
 # $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $
 # $FreeBSD: src/etc/rc.d/motd,v 1.6 2003/06/30 22:06:26 mtm Exp $
-# $DragonFly: src/etc/rc.d/motd,v 1.4 2003/12/12 16:03:48 eirikn Exp $
+# $DragonFly: src/etc/rc.d/motd,v 1.5 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: motd
 # REQUIRE: mountcritremote
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -16,18 +16,7 @@ name="motd"
 rcvar="update_motd"
 start_cmd="motd_start"
 stop_cmd=":"
-
-case ${OSTYPE} in
-DragonFly)
-	PERMS="644"
-	;;
-FreeBSD)
-	PERMS="644"
-	;;
-NetBSD)
-	PERMS="664"
-	;;
-esac
+PERMS="644"
 
 motd_start()
 {
@@ -40,23 +29,9 @@ motd_start()
 		install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd
 	fi
 
-	case ${OSTYPE} in
-	DragonFly)
-		T=`mktemp -t motd`
-		uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T}
-		awk '{if (NR == 1) {if ($1 == "DragonFly") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T}
-		;;
-	FreeBSD)
-		T=`mktemp -t motd`
-		uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T}
-		awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T}
-		;;
-	NetBSD)
-		T='/etc/_motd'
-		sysctl -n kern.version | while read i; do echo $i; break; done > $T
-		sed '1{/^NetBSD.*/{d;};};' < /etc/motd >> $T
-		;;
-	esac
+	T=`mktemp -t motd`
+	uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T}
+	awk '{if (NR == 1) {if ($1 == "DragonFly") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T}
 	cmp -s $T /etc/motd || {
 		cp $T /etc/motd
 		chmod ${PERMS} /etc/motd
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal
index 59ee6664b1..bd389c709c 100644
--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@@ -2,12 +2,12 @@
 #
 # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $
 # $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.5 2003/06/01 01:43:37 gordon Exp $
-# $DragonFly: src/etc/rc.d/mountcritlocal,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/mountcritlocal,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: mountcritlocal
 # REQUIRE: root
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -17,81 +17,35 @@ stop_cmd=":"
 
 mountcritlocal_start()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		# Set up the list of network filesystem types for which mounting
-		# should be delayed until after network initialization.
-		case ${extra_netfs_types} in
-		[Nn][Oo])
-			;;
+	# Set up the list of network filesystem types for which mounting
+	# should be delayed until after network initialization.
+	case ${extra_netfs_types} in
+	[Nn][Oo])
+	;;
 		*)
-			netfs_types="${netfs_types} ${extra_netfs_types}"
+		netfs_types="${netfs_types} ${extra_netfs_types}"
 			;;
 		esac
 
-		# Mount everything except nfs filesystems.
-		mount_excludes='no'
-		for i in ${netfs_types}; do
-			fstype=${i%:*}
-			mount_excludes="${mount_excludes}${fstype},"
-		done
-		mount_excludes=${mount_excludes%,}
-		mount -a -t ${mount_excludes}
-		case $? in
-		0)
-			;;
-		*)
-			echo 'Mounting /etc/fstab filesystems failed,' \
+	# Mount everything except nfs filesystems.
+	mount_excludes='no'
+	for i in ${netfs_types}; do
+		fstype=${i%:*}
+		mount_excludes="${mount_excludes}${fstype},"
+	done
+	mount_excludes=${mount_excludes%,}
+	mount -a -t ${mount_excludes}
+	case $? in
+	0)
+		;;
+	*)
+		echo 'Mounting /etc/fstab filesystems failed,' \
 			' startup aborted'
-			exit 1
-			;;
-		esac
+		exit 1
 		;;
-
-	FreeBSD)
-		# Set up the list of network filesystem types for which mounting
-		# should be delayed until after network initialization.
-		case ${extra_netfs_types} in
-		[Nn][Oo])
-			;;
-		*)
-			netfs_types="${netfs_types} ${extra_netfs_types}"
-			;;
-		esac
-
-		# Mount everything except nfs filesystems.
-		mount_excludes='no'
-		for i in ${netfs_types}; do
-			fstype=${i%:*}
-			mount_excludes="${mount_excludes}${fstype},"
-		done
-		mount_excludes=${mount_excludes%,}
-		mount -a -t ${mount_excludes}
-
-		case $? in
-		0)
-			;;
-		*)
-			echo 'Mounting /etc/fstab filesystems failed,' \
-			    ' startup aborted'
-			exit 1
-			;;
 		esac
 		;;
-	NetBSD)
-		#	Mount critical filesystems that are `local'
-		#	(as specified in $critical_filesystems_local)
-		#	This usually includes /var.
-		#
-		mount_critical_filesystems local
 
-		#	clean up left-over files.
-		#	this could include the cleanup of lock files and /var/run, etc.
-		#
-		rm -f /etc/nologin /var/spool/lock/LCK.* /var/spool/uucp/STST/*
-		(cd /var/run && rm -rf -- *)
-		;;
-	esac
 }
 
 load_rc_config $name
diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote
index f80cf746ef..d78e4c2ba7 100644
--- a/etc/rc.d/mountcritremote
+++ b/etc/rc.d/mountcritremote
@@ -2,31 +2,20 @@
 #
 # $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $
 # $FreeBSD: src/etc/rc.d/mountcritremote,v 1.6 2003/06/01 01:43:37 gordon Exp $
-# $DragonFly: src/etc/rc.d/mountcritremote,v 1.3 2003/11/19 20:11:58 dillon Exp $
+# $DragonFly: src/etc/rc.d/mountcritremote,v 1.4 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: mountcritremote
 # REQUIRE: NETWORKING root mountcritlocal
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
 name="mountcritremote"
 stop_cmd=":"
 
-case ${OSTYPE} in
-	DragonFly)
-	start_cmd="mountcritremote_start"
-	start_precmd="mountcritremote_precmd"
-	;;
-	FreeBSD)
-	start_cmd="mountcritremote_start"
-	start_precmd="mountcritremote_precmd"
-	;;
-NetBSD)
-	start_cmd="mountcritremote_start"
-	;;
-esac
+start_cmd="mountcritremote_start"
+start_precmd="mountcritremote_precmd"
 
 # Mount NFS filesystems if present in /etc/fstab
 #
@@ -52,81 +41,36 @@ mountcritremote_precmd()
 
 mountcritremote_start()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		# Mount nfs filesystems.
-		#
-		echo -n 'Mounting NFS file systems:'
-		mount -a -t nfs
-		echo '.'
-		# Mount other network filesystems if present in /etc/fstab.
-		case ${extra_netfs_types} in
-		[Nn][Oo])
-			;;
-		*)
-			netfs_types="${netfs_types} ${extra_netfs_types}"
-			;;
-		esac
-		for i in ${netfs_types}; do
-			fstype=${i%:*}
-			fsdecr=${i#*:}
-			[ "${fstype}" = "nfs" ] && continue
-			case "`mount -d -a -t ${fstype}`" in
-			*mount_${fstype}*)
-				echo -n "Mounting ${fsdecr} file systems:"
-				mount -a -t ${fstype}
-				echo '.'
-				;;
-			esac
-		done
-
-		# Cleanup /var again just in case it's a network mount.
-		/etc/rc.d/cleanvar reload
-		rm -f /var/run/clean_var /var/spool/lock/clean_var
+	# Mount nfs filesystems.
+	#
+	echo -n 'Mounting NFS file systems:'
+	mount -a -t nfs
+	echo '.'
+	# Mount other network filesystems if present in /etc/fstab.
+	case ${extra_netfs_types} in
+	[Nn][Oo])
 		;;
-	FreeBSD)
-		# Mount nfs filesystems.
-		#
-		echo -n 'Mounting NFS file systems:'
-		mount -a -t nfs
-		echo '.'
-
-		# Mount other network filesystems if present in /etc/fstab.
-		case ${extra_netfs_types} in
-		[Nn][Oo])
-			;;
-		*)
-			netfs_types="${netfs_types} ${extra_netfs_types}"
+	*)
+		netfs_types="${netfs_types} ${extra_netfs_types}"
+		;;
+	esac
+	for i in ${netfs_types}; do
+		fstype=${i%:*}
+		fsdecr=${i#*:}
+		[ "${fstype}" = "nfs" ] && continue
+		case "`mount -d -a -t ${fstype}`" in
+		*mount_${fstype}*)
+			echo -n "Mounting ${fsdecr} file systems:"
+			mount -a -t ${fstype}
+			echo '.'
 			;;
 		esac
+	done
 
-		for i in ${netfs_types}; do
-			fstype=${i%:*}
-			fsdecr=${i#*:}
-
-			[ "${fstype}" = "nfs" ] && continue
-
-			case "`mount -d -a -t ${fstype}`" in
-			*mount_${fstype}*)
-				echo -n "Mounting ${fsdecr} file systems:"
-				mount -a -t ${fstype}
-				echo '.'
-				;;
-			esac
-		done
-
-		# Cleanup /var again just in case it's a network mount.
-		/etc/rc.d/cleanvar reload
-		rm -f /var/run/clean_var /var/spool/lock/clean_var
-		;;
-	NetBSD)
-		#	Mount critical filesystems that may be `remote'.
-		#	(as specified in $critical_filesystems_remote)
-		#	This usually includes /usr.
-		#
-		mount_critical_filesystems remote
-		;;
-	esac
+	# Cleanup /var again just in case it's a network mount.
+	/etc/rc.d/cleanvar reload
+	rm -f /var/run/clean_var /var/spool/lock/clean_var
+	;;
 }
 
 load_rc_config $name
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd
index 8c60a64da1..29296a3295 100644
--- a/etc/rc.d/mountd
+++ b/etc/rc.d/mountd
@@ -2,12 +2,12 @@
 #
 # $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $
 # $FreeBSD: src/etc/rc.d/mountd,v 1.9 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/mountd,v 1.3 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/mountd,v 1.4 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: mountd
 # REQUIRE: NETWORKING mountall beforemountlkm nfsserver rpcbind quota
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
@@ -20,48 +20,23 @@ extra_commands="reload"
 
 mountd_precmd()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		if ! checkyesno rpcbind_enable  && \
-		! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
-		then
-			force_depend rpcbind || return 1
+	if ! checkyesno rpcbind_enable  && \
+	! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
+	then
+		force_depend rpcbind || return 1
+	fi
+	# mountd flags will differ depending on rc.conf settings
+	#
+	case ${nfs_server_enable} in
+	[Yy][Ee][Ss])
+		if checkyesno weak_mountd_authentication; then
+			mountd_flags="${mountd_flags} -n"
 		fi
-		# mountd flags will differ depending on rc.conf settings
-		#
-		case ${nfs_server_enable} in
-		[Yy][Ee][Ss])
-			if checkyesno weak_mountd_authentication; then
-				mountd_flags="${mountd_flags} -n"
-			fi
-			;;
-		*)
-			if checkyesno mountd_enable; then
-				checkyesno weak_mountd_authentication && mountd_flags="-n"
-			fi
-		esac
 		;;
-	FreeBSD)
-		if ! checkyesno rpcbind_enable  && \
-		    ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
-		then
-			force_depend rpcbind || return 1
+	*)
+		if checkyesno mountd_enable; then
+			checkyesno weak_mountd_authentication && mountd_flags="-n"
 		fi
-
-		# mountd flags will differ depending on rc.conf settings
-		#
-		case ${nfs_server_enable} in
-		[Yy][Ee][Ss])
-			if checkyesno weak_mountd_authentication; then
-				mountd_flags="${mountd_flags} -n"
-			fi
-			;;
-		*)
-			if checkyesno mountd_enable; then
-				checkyesno weak_mountd_authentication && mountd_flags="-n"
-			fi
-		esac
-		;;
 	esac
 	rm -f /var/db/mountdtab
 	( umask 022 ; > /var/db/mountdtab )
diff --git a/etc/rc.d/moused b/etc/rc.d/moused
index ae6c8b1221..1e6bf84262 100644
--- a/etc/rc.d/moused
+++ b/etc/rc.d/moused
@@ -2,27 +2,19 @@
 #
 # $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $
 # $FreeBSD: src/etc/rc.d/moused,v 1.3 2002/09/27 16:54:21 gordon Exp $
-# $DragonFly: src/etc/rc.d/moused,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/moused,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: moused
 # REQUIRE: DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
 name=moused
 rcvar=`set_rcvar`
 command="/usr/sbin/${name}"
-
-case ${OSTYPE} in
-DragonFly)
-	start_cmd="moused_start"
-	;;
-FreeBSD)
-	start_cmd="moused_start"
-	;;
-esac
+start_cmd="moused_start"
 
 moused_start()
 {
diff --git a/etc/rc.d/mroute6d b/etc/rc.d/mroute6d
index 50b6cd9e57..11e7ecb0e1 100644
--- a/etc/rc.d/mroute6d
+++ b/etc/rc.d/mroute6d
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/mroute6d,v 1.2 2003/01/25 23:14:08 mtm Exp $
-# $DragonFly: src/etc/rc.d/mroute6d,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/mroute6d,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: mroute6d
 # REQUIRE: network_ipv6
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted
index c85b709a29..059a7442c0 100644
--- a/etc/rc.d/mrouted
+++ b/etc/rc.d/mrouted
@@ -2,12 +2,12 @@
 #
 # $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/mrouted,v 1.5 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/mrouted,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/mrouted,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: mrouted
 # REQUIRE: netif routing
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/msgs b/etc/rc.d/msgs
index 3d1160a0c2..4e90e1252b 100644
--- a/etc/rc.d/msgs
+++ b/etc/rc.d/msgs
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/msgs,v 1.1 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/msgs,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/msgs,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: msgs
 # REQUIRE: LOGIN
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 dummy_rc_command "$1"
diff --git a/etc/rc.d/named b/etc/rc.d/named
index bb2d18adf8..f7da5829b8 100644
--- a/etc/rc.d/named
+++ b/etc/rc.d/named
@@ -2,13 +2,13 @@
 #
 # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/named,v 1.6 2003/01/12 04:53:54 mtm Exp $
-# $DragonFly: src/etc/rc.d/named,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/named,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: named
 # REQUIRE: SERVERS
 # BEFORE:  DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
@@ -19,20 +19,8 @@ start_precmd="named_precmd"
 required_dirs="$named_chrootdir"	# if it is set, it must exist
 extra_commands="reload"
 
-case ${OSTYPE} in
-DragonFly)
-	nuser=bind
-	ngroup=bind
-	;;
-FreeBSD)
-	nuser=bind
-	ngroup=bind
-	;;
-NetBSD)
-	nuser=named
-	ngroup=named
-	;;
-esac
+nuser=bind
+ngroup=bind
 
 # If running in a chroot cage, ensure that the appropriate files
 # exist inside the cage, as well as helper symlinks into the cage
@@ -83,57 +71,19 @@ make_symlinks()
 
 named_precmd()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		! checkyesno named_rcng && return 0
-		# Is the user using a sandbox?
-		if [ -z "$named_chrootdir" ]; then
-			rc_flags="-u $nuser -g $ngroup $rc_flags"
-			return 0
-		fi
-		# Do the following checks only if the user wants them done
-		checkyesno named_chroot_autoupdate && chroot_autoupdate
-		;;
-	FreeBSD)
-		! checkyesno named_rcng && return 0
-		# Is the user using a sandbox?
-		if [ -z "$named_chrootdir" ]; then
-			rc_flags="-u $nuser -g $ngroup $rc_flags"
-			return 0
-		fi
-
-		# Do the following checks only if the user wants them done
-		checkyesno named_chroot_autoupdate && chroot_autoupdate
-		;;
-	NetBSD)
-		chroot_autoupdate
-		;;
-	esac
-
-	case ${OSTYPE} in
-	DragonFly)	
-		# Make the symlinks only if the user wants them done.
-                checkyesno named_symlink_enable && make_symlinks
-                ;;	
-	FreeBSD)
-		# Make the symlinks only if the user wants them done.
-		checkyesno named_symlink_enable && make_symlinks
-		;;
-	NetBSD)
-		make_symlinks
-		;;
-	esac
+	! checkyesno named_rcng && return 0
+	# Is the user using a sandbox?
+	if [ -z "$named_chrootdir" ]; then
+		rc_flags="-u $nuser -g $ngroup $rc_flags"
+		return 0
+	fi
+	# Do the following checks only if the user wants them done
+	checkyesno named_chroot_autoupdate && chroot_autoupdate
+        checkyesno named_symlink_enable && make_symlinks
 
 	#       Change run_rc_commands()'s internal copy of $named_flags
 	#
-	case ${OSTYPE} in
-	DragonFly)
-		! checkyesno named_rcng && return
-		;;
-	FreeBSD)
-		! checkyesno named_rcng && return
-		;;
-	esac
+	! checkyesno named_rcng && return
 	rc_flags="-u $nuser -g $ngroup -t ${named_chrootdir} $rc_flags"
 }
 
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index 65b20b0779..37f0229e77 100644
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -23,12 +23,12 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/netif,v 1.2 2003/06/29 05:34:41 mtm Exp $
-# $DragonFly: src/etc/rc.d/netif,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/netif,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: netif
 # REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl tty
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 . /etc/network.subr
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index decf3442c2..d77faf9ef2 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/netoptions,v 1.138 2003/06/29 05:09:48 mtm Exp $
-# $DragonFly: src/etc/rc.d/netoptions,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/netoptions,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: netoptions
 # REQUIRE: localdaemons
 # BEFORE:  securelevel
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 5a16de2d9a..20e41eaed7 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/network1,v 1.147 2003/06/06 13:00:43 mtm Exp $
-# $DragonFly: src/etc/rc.d/Attic/network1,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/network1,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: network1
 # REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl tty
-# KEYWORD: DragonFly FreeBSD nostart
+# KEYWORD: DragonFly  nostart
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index be46ad34aa..0c05b6b1e6 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -3,12 +3,12 @@
 # Configure routing and miscellaneous network tunables
 #
 # $FreeBSD: src/etc/rc.d/network2,v 1.137 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/Attic/network2,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/network2,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: network2
 # REQUIRE: netif ppp-user
-# KEYWORD: DragonFly FreeBSD nostart
+# KEYWORD: DragonFly  nostart
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index f902e63412..427480e84a 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/network3,v 1.138 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/Attic/network3,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/network3,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: network3
 # REQUIRE: localdaemons
 # BEFORE:  securelevel
-# KEYWORD: DragonFly FreeBSD nostart
+# KEYWORD: DragonFly  nostart
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index 51101c5bc8..f2111d5d6b 100644
--- a/etc/rc.d/network_ipv6
+++ b/etc/rc.d/network_ipv6
@@ -26,12 +26,12 @@
 #
 # $FreeBSD: src/etc/rc.d/network_ipv6,v 1.35 2003/06/29 05:15:57 mtm Exp $
 # 	From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43
-# $DragonFly: src/etc/rc.d/network_ipv6,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/network_ipv6,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: network_ipv6
 # REQUIRE: routing
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 . /etc/network.subr
diff --git a/etc/rc.d/nfsclient b/etc/rc.d/nfsclient
index 65e771b2fd..b30ca7f6ba 100644
--- a/etc/rc.d/nfsclient
+++ b/etc/rc.d/nfsclient
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/nfsclient,v 1.3 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/nfsclient,v 1.3 2003/11/19 20:11:58 dillon Exp $
+# $DragonFly: src/etc/rc.d/nfsclient,v 1.4 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: nfsclient
 # REQUIRE: NETWORKING mountcritremote rpcbind
-# KEYWORD: DragonFly FreeBSD shutdown
+# KEYWORD: DragonFly shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd
index 36f342c910..e515634f3a 100644
--- a/etc/rc.d/nfsd
+++ b/etc/rc.d/nfsd
@@ -2,36 +2,22 @@
 #
 # $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $
 # $FreeBSD: src/etc/rc.d/nfsd,v 1.9 2003/01/24 00:37:52 mtm Exp $
-# $DragonFly: src/etc/rc.d/nfsd,v 1.3 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/nfsd,v 1.4 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: nfsd
 # REQUIRE: mountd
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
 name="nfsd"
 rcvar=`set_rcvar nfs_server`
 command="/sbin/${name}"
-
 load_rc_config $name
-case ${OSTYPE} in
-DragonFly)
-	command_args="${nfs_server_flags}"
-	start_precmd="nfsd_precmd"
-	sig_stop="USR1"
-	;;
-FreeBSD)
-	command_args="${nfs_server_flags}"
-	start_precmd="nfsd_precmd"
-	sig_stop="USR1"
-	;;
-NetBSD)
-	required_vars="mountd rpcbind"
-	start_precmd=
-	;;
-esac
+command_args="${nfs_server_flags}"
+start_precmd="nfsd_precmd"
+sig_stop="USR1"
 
 nfsd_precmd()
 {
diff --git a/etc/rc.d/nfslocking b/etc/rc.d/nfslocking
index 971869a60c..06ee3f6b42 100644
--- a/etc/rc.d/nfslocking
+++ b/etc/rc.d/nfslocking
@@ -2,38 +2,22 @@
 #
 # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
 # $FreeBSD: src/etc/rc.d/nfslocking,v 1.4 2003/01/20 18:57:16 mtm Exp $
-# $DragonFly: src/etc/rc.d/nfslocking,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/nfslocking,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: nfslocking
 # REQUIRE: nfsserver nfsclient nfsd
 # BEFORE:  DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
 arg=$1
 
-case ${OSTYPE} in
-DragonFly)
-	RCVAR_SERVER="nfs_server_enable"
-	RCVAR_CLIENT="nfs_client_enable"
-	RCVAR_STATD="rpc_statd_enable"
-	RCVAR_LOCKD="rpc_lockd_enable"
-	;;
-FreeBSD)
-	RCVAR_SERVER="nfs_server_enable"
-	RCVAR_CLIENT="nfs_client_enable"
-	RCVAR_STATD="rpc_statd_enable"
-	RCVAR_LOCKD="rpc_lockd_enable"
-	;;
-NetBSD)
-	RCVAR_SERVER="nfs_server"
-	RCVAR_CLIENT="nfs_client"
-	RCVAR_STATD="statd"
-	RCVAR_LOCKD="lockd"
-	;;
-esac
+RCVAR_SERVER="nfs_server_enable"
+RCVAR_CLIENT="nfs_client_enable"
+RCVAR_STATD="rpc_statd_enable"
+RCVAR_LOCKD="rpc_lockd_enable"
 
 start_precmd='checkyesno ${RCVAR_SERVER} || checkyesno ${RCVAR_CLIENT} ||
              [ -n "$rc_force" ]'
diff --git a/etc/rc.d/nfsserver b/etc/rc.d/nfsserver
index 95d95d55cb..fc072b868c 100644
--- a/etc/rc.d/nfsserver
+++ b/etc/rc.d/nfsserver
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/nfsserver,v 1.2 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/nfsserver,v 1.2 2003/11/19 20:11:58 dillon Exp $
+# $DragonFly: src/etc/rc.d/nfsserver,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: nfsserver
 # REQUIRE: NETWORKING mountcritremote
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/nisdomain b/etc/rc.d/nisdomain
index d00224e092..29806992ab 100644
--- a/etc/rc.d/nisdomain
+++ b/etc/rc.d/nisdomain
@@ -24,13 +24,13 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/nisdomain,v 1.1 2003/04/18 17:51:54 mtm Exp $
-# $DragonFly: src/etc/rc.d/nisdomain,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/nisdomain,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: nisdomain
 # REQUIRE: SERVERS rpcbind
 # BEFORE:  ypbind ypserv ypxfrd
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index 883e59dc30..368e996ec3 100644
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -2,13 +2,13 @@
 #
 # $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/ntpd,v 1.5 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/Attic/ntpd,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/ntpd,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: ntpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -17,13 +17,6 @@ rcvar=`set_rcvar`
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/ntp.conf"
-
-case ${OSTYPE} in
-NetBSD)
-	start_precmd="ntpd_precmd"
-	;;
-esac
-
 ntpd_precmd()
 {
 	if [ -z "$ntpd_chrootdir" ]; then
diff --git a/etc/rc.d/othermta b/etc/rc.d/othermta
index 0df633f044..0f3c6b8f92 100644
--- a/etc/rc.d/othermta
+++ b/etc/rc.d/othermta
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/othermta,v 1.2 2002/08/09 17:45:04 gordon Exp $
-# $DragonFly: src/etc/rc.d/othermta,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/othermta,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: mail
 # REQUIRE: LOGIN
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 # XXX - TEMPORARY SCRIPT UNTIL YOU WRITE YOUR OWN REPLACEMENT.
 #
diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard
index 5b2eb489c9..6c1909265f 100644
--- a/etc/rc.d/pccard
+++ b/etc/rc.d/pccard
@@ -25,12 +25,12 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/pccard,v 1.28 2003/02/12 04:12:23 imp Exp $
-# $DragonFly: src/etc/rc.d/Attic/pccard,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/pccard,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: pccard
 # REQUIRE: mountcritlocal
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/pcvt b/etc/rc.d/pcvt
index e3fa4d8f6d..c12454965d 100644
--- a/etc/rc.d/pcvt
+++ b/etc/rc.d/pcvt
@@ -25,12 +25,12 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/pcvt,v 1.3 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/Attic/pcvt,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/pcvt,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: pcvt
 # REQUIRE: LOGIN
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ppp-user b/etc/rc.d/ppp-user
index 3de41c0d73..d7611f66e4 100644
--- a/etc/rc.d/ppp-user
+++ b/etc/rc.d/ppp-user
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/ppp-user,v 1.4 2003/04/18 17:55:05 mtm Exp $
-# $DragonFly: src/etc/rc.d/ppp-user,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/ppp-user,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: ppp-user
 # REQUIRE: netif isdnd
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/pppoed b/etc/rc.d/pppoed
index 0051a451df..e17a41d509 100644
--- a/etc/rc.d/pppoed
+++ b/etc/rc.d/pppoed
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/pppoed,v 1.1 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/pppoed,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/pppoed,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: pppoed
 # REQUIRE: NETWORKING
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/pwcheck b/etc/rc.d/pwcheck
index 794458694a..d05e711493 100644
--- a/etc/rc.d/pwcheck
+++ b/etc/rc.d/pwcheck
@@ -2,13 +2,13 @@
 #
 # $NetBSD: pwcheck,v 1.4 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/pwcheck,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/pwcheck,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/pwcheck,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: pwcheck
 # REQUIRE: mountcritremote syslogd
 # BEFORE:  DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/quota b/etc/rc.d/quota
index 0c6de5f21b..3c3f032ed5 100644
--- a/etc/rc.d/quota
+++ b/etc/rc.d/quota
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/quota,v 1.3 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/quota,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/quota,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # Enable/Check the quotas (must be after ypbind if using NIS)
@@ -10,7 +10,7 @@
 # PROVIDE: quota
 # REQUIRE: mountcritremote
 # BEFORE: DAEMON
-# KEYWORD: DragonFly  FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/random b/etc/rc.d/random
index dd045e474e..57ca4e9cb4 100644
--- a/etc/rc.d/random
+++ b/etc/rc.d/random
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/random,v 1.3 2003/04/18 17:55:05 mtm Exp $
-# $DragonFly: src/etc/rc.d/random,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/random,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: random
 # REQUIRE: diskless mountcritlocal initrandom
 # BEFORE: netif
-# KEYWORD: DragonFly FreeBSD shutdown
+# KEYWORD: DragonFly shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd
index ea52b9aa36..36afcf4f21 100644
--- a/etc/rc.d/rarpd
+++ b/etc/rc.d/rarpd
@@ -2,13 +2,13 @@
 #
 # $NetBSD: rarpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/rarpd,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/rarpd,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/rarpd,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: rarpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/rcconf.sh b/etc/rc.d/rcconf.sh
index 9cda01e852..65fcf8cd0a 100644
--- a/etc/rc.d/rcconf.sh
+++ b/etc/rc.d/rcconf.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/rcconf.sh,v 1.2 2003/01/25 20:02:35 mtm Exp $
-# $DragonFly: src/etc/rc.d/rcconf.sh,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/rcconf.sh,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: rcconf
 # REQUIRE: initdiskless
 # BEFORE:  disks initrandom
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 dummy_rc_command "$1"
diff --git a/etc/rc.d/root b/etc/rc.d/root
index 7424dc721b..1a17f44bcf 100644
--- a/etc/rc.d/root
+++ b/etc/rc.d/root
@@ -2,12 +2,12 @@
 #
 # $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $
 # $FreeBSD: src/etc/rc.d/root,v 1.5 2002/10/31 02:06:05 gordon Exp $
-# $DragonFly: src/etc/rc.d/root,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/root,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: root
 # REQUIRE: fsck
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -17,59 +17,26 @@ stop_cmd=":"
 
 root_start()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		# root normally must be read/write, but if this is a BOOTP NFS
-		# diskless boot it does not have to be.
-		#
-		case ${root_rw_mount} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			if ! mount -u -o rw /; then
-				echo 'Mounting root filesystem rw failed, startup aborted'
-				exit 1
-			fi
-			;;
-		esac
-		umount -a >/dev/null 2>&1
-		mount /
-		# If we booted a special kernel remove the record
-		# so we will boot the default kernel next time.
-		if [ -e /boot/nextkernel ]; then
-			rm -f /boot/nextkernel
-		fi
+	# root normally must be read/write, but if this is a BOOTP NFS
+	# diskless boot it does not have to be.
+	#
+	case ${root_rw_mount} in
+	[Nn][Oo] | '')
 		;;
-	FreeBSD)
-		# root normally must be read/write, but if this is a BOOTP NFS
-		# diskless boot it does not have to be.
-		#
-		case ${root_rw_mount} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			if ! mount -u -o rw /; then
-				echo 'Mounting root filesystem rw failed, startup aborted'
-				exit 1
-			fi
-			;;
-		esac
-
-		umount -a >/dev/null 2>&1
-		mount /
-
-		# If we booted a special kernel remove the record
-		# so we will boot the default kernel next time.
-		if [ -e /boot/nextkernel ]; then
-			rm -f /boot/nextkernel
+	*)
+		if ! mount -u -o rw /; then
+			echo 'Mounting root filesystem rw failed, startup aborted'
+			exit 1
 		fi
 		;;
-	NetBSD)
-		umount -a >/dev/null 2>&1
-		mount /
-		rm -f /fastboot
-		;;
 	esac
+	umount -a >/dev/null 2>&1
+	mount /
+	# If we booted a special kernel remove the record
+	# so we will boot the default kernel next time.
+	if [ -e /boot/nextkernel ]; then
+		rm -f /boot/nextkernel
+	fi
 }
 
 load_rc_config $name
diff --git a/etc/rc.d/route6d b/etc/rc.d/route6d
index 11043b5a54..00d4c5b343 100644
--- a/etc/rc.d/route6d
+++ b/etc/rc.d/route6d
@@ -2,12 +2,12 @@
 #
 # $NetBSD: route6d,v 1.5 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/route6d,v 1.5 2003/01/25 23:14:08 mtm Exp $
-# $DragonFly: src/etc/rc.d/route6d,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/route6d,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: route6d
 # REQUIRE: network_ipv6
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -19,22 +19,8 @@ name="route6d"
 #	is also needed by the eval statement in the FreeBSD conditional.
 #
 load_rc_config $name
-
-case ${OSTYPE} in
-DragonFly)
-	rcvar="ipv6_router_enable"
-	command="${ipv6_router:-/usr/sbin/${name}}"
-	eval ${name}_flags=\"${ipv6_router_flags}\"
-	;;
-FreeBSD)
-	rcvar="ipv6_router_enable"
-	command="${ipv6_router:-/usr/sbin/${name}}"
-	eval ${name}_flags=\"${ipv6_router_flags}\"
-	;;
-NetBSD)
-	rcvar=$name
-	command="/usr/sbin/${name}"
-	;;
-esac
+rcvar="ipv6_router_enable"
+command="${ipv6_router:-/usr/sbin/${name}}"
+eval ${name}_flags=\"${ipv6_router_flags}\"
 
 run_rc_command "$1"
diff --git a/etc/rc.d/routed b/etc/rc.d/routed
index ec899733db..6a72eaaf7c 100644
--- a/etc/rc.d/routed
+++ b/etc/rc.d/routed
@@ -2,7 +2,7 @@
 #
 # $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/routed,v 1.6 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/routed,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/routed,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: routed
@@ -19,25 +19,10 @@ name="routed"
 #
 load_rc_config $name
 
-case ${OSTYPE} in
-DragonFly)
-	rcvar="router_enable"
-	command="${router:-/sbin/${name}}"
-	eval ${name}_flags=${router_flags}
-	start_precmd=
-	;;
-FreeBSD)
-	rcvar="router_enable"
-	command="${router:-/sbin/${name}}"
-	eval ${name}_flags=${router_flags}
-	start_precmd=
-	;;
-NetBSD)
-	rcvar=${name}
-	command="/sbin/${name}"
-	start_precmd="routed_precmd"
-	;;
-esac
+rcvar="router_enable"
+command="${router:-/sbin/${name}}"
+eval ${name}_flags=${router_flags}
+start_precmd=
 
 routed_precmd()
 {
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index eafa240548..3614db81d7 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -3,12 +3,12 @@
 # Configure routing and miscellaneous network tunables
 #
 # $FreeBSD: src/etc/rc.d/routing,v 1.138 2003/06/29 17:59:09 mtm Exp $
-# $DragonFly: src/etc/rc.d/routing,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/routing,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: routing
 # REQUIRE: netif ppp-user
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd
index 9d0d314c09..b488406676 100644
--- a/etc/rc.d/rtadvd
+++ b/etc/rc.d/rtadvd
@@ -2,13 +2,13 @@
 #
 # $NetBSD: rtadvd,v 1.5 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/rtadvd,v 1.5 2003/01/24 00:37:52 mtm Exp $
-# $DragonFly: src/etc/rc.d/rtadvd,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/rtadvd,v 1.3 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: rtadvd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -19,17 +19,7 @@ start_precmd="rtadvd_precmd"
 
 rtadvd_precmd()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		IS_GATEWAY="checkyesno ipv6_gateway_enable"
-                ;;
-	FreeBSD)
-		IS_GATEWAY="checkyesno ipv6_gateway_enable"
-		;;
-	NetBSD)
-		IS_GATEWAY="eval [ \"$ip6mode\" = \"router\" ]"
-		;;
-	esac
+	IS_GATEWAY="checkyesno ipv6_gateway_enable"
 	if ! ${IS_GATEWAY}; then
 		warn \
 		  "${name} cannot be used on IPv6 host, only on an IPv6 router."
@@ -49,58 +39,27 @@ rtadvd_precmd()
 	# from another machine, so if you enable this, do it with
 	# enough care.)
 	#
-	case ${OSTYPE} in
-	DragonFly)
-		# If specific interfaces haven't been specified,
-		# get a list of interfaces and enable it on them
-		#
-		case ${rtadvd_interfaces} in
-		'')
-			for i in `ifconfig -l` ; do
-				case $i in
-				lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
-					continue
-					;;
-				*)
-					rtadvd_interfaces="${rtadvd_interfaces} ${i}"
-					;;
-				esac
-			done
-			;;
-		esac
-		command_args="${rtadvd_interfaces}"
-		# Enable Router Renumbering, unicast case
-		# (use correct src/dst addr)
-		# rtadvd -R "in ipsec ah/transport/fec0:0:0:1::1-fec0:0:0:10::1/require" ${ipv6_network_interf
-		;;
-	FreeBSD)
-		# If specific interfaces haven't been specified,
-		# get a list of interfaces and enable it on them
-		#
-		case ${rtadvd_interfaces} in
-		'')
-			for i in `ifconfig -l` ; do
-				case $i in
-				lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
-					continue
-					;;
-				*)
-					rtadvd_interfaces="${rtadvd_interfaces} ${i}"
-					;;
-				esac
-			done
-			;;
+	# If specific interfaces haven't been specified,
+	# get a list of interfaces and enable it on them
+	#
+	case ${rtadvd_interfaces} in
+	'')
+		for i in `ifconfig -l` ; do
+			case $i in
+			lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
+				continue
+				;;
+			*)
+				rtadvd_interfaces="${rtadvd_interfaces} ${i}"
+				;;
 		esac
-		command_args="${rtadvd_interfaces}"
-
-		# Enable Router Renumbering, unicast case
-		# (use correct src/dst addr)
-		# rtadvd -R "in ipsec ah/transport/fec0:0:0:1::1-fec0:0:0:10::1/require" ${ipv6_network_interfaces}
-		# Enable Router Renumbering, multicast case
-		# (use correct src addr)
-		# rtadvd -R "in ipsec ah/transport/ff05::2-fec0:0:0:10::1/require" ${ipv6_network_interfaces}
+		done
 		;;
 	esac
+	command_args="${rtadvd_interfaces}"
+	# Enable Router Renumbering, unicast case
+	# (use correct src/dst addr)
+	# rtadvd -R "in ipsec ah/transport/fec0:0:0:1::1-fec0:0:0:10::1/require" ${ipv6_network_interf
 	return 0
 }
 
diff --git a/etc/rc.d/rwho b/etc/rc.d/rwho
index 12a3533408..b3b6d6c1a4 100644
--- a/etc/rc.d/rwho
+++ b/etc/rc.d/rwho
@@ -2,13 +2,13 @@
 #
 # $NetBSD: rwho,v 1.5 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/rwho,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/rwho,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/rwho,v 1.2 2004/01/27 00:42:45 rob Exp $
 #
 
 # PROVIDE: rwho
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index 0a34bc68e5..984e5fc34e 100644
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -2,13 +2,13 @@
 #
 # $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/savecore,v 1.3 2002/09/06 16:18:05 gordon Exp $
-# $DragonFly: src/etc/rc.d/savecore,v 1.4 2003/12/14 19:13:15 dillon Exp $
+# $DragonFly: src/etc/rc.d/savecore,v 1.5 2004/01/27 00:42:46 rob Exp $
 #
 
 # PROVIDE: savecore
 # REQUIRE: syslogd
 # BEFORE:  SERVERS
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -30,65 +30,28 @@ savecore_prestart()
 	#
 	DUMPDIR="${dumpdir:-/var/crash}"
 
-	case ${OSTYPE} in
-	DragonFly)
-		# Quit if we have no dumb device
-		case ${dumpdev} in
-		[Nn][Oo] | '')
-			debug 'No dump device. Quitting.'
-			dumpdev=
-			return 0
-			;;
-		esac
-		# If there is no crash directory set it now
-		case ${dumpdir} in
-		'')
-			dumpdir='/var/crash'
-			;;
-		[Nn][Oo])
-			dumpdir='NO'
-			;;
-		esac
-		if [ ! -e "${dumpdev}" -o ! -d "${dumpdir}" ]; then
-			warn "Wrong dump device or directory. Savecore not run."
-			dumpdev=
-			return 0
-		fi
-		;;
-	FreeBSD)
-		# Quit if we have no dump device
-		case ${dumpdev} in
-		[Nn][Oo] | '')
-			debug 'No dump device. Quitting.'
-			dumpdev=
-			return 0
-			;;
-		esac
-
-		# If there is no crash directory set it now
-		case ${dumpdir} in
-		'')
-			dumpdir='/var/crash'
-			;;
-		[Nn][Oo])
-			dumpdir='NO'
-			;;
-		esac
-
-		if [ ! -e "${dumpdev}" -o ! -d "${dumpdir}" ]; then
-			warn "Wrong dump device or directory. Savecore not run."
-			dumpdev=
-			return 0
-		fi
+	# Quit if we have no dumb device
+	case ${dumpdev} in
+	[Nn][Oo] | '')
+		debug 'No dump device. Quitting.'
+		dumpdev=
+		return 0
+	;;
+	esac
+	# If there is no crash directory set it now
+	case ${dumpdir} in
+	'')
+		dumpdir='/var/crash'
 		;;
-	NetBSD)
-		if [ ! -d "${dumpdir}" ]; then
-			warn "No /var/crash directory; savecore not run."
-			dumpdev=
-			return 0
-		fi
+	[Nn][Oo])
+		dumpdir='NO'
 		;;
 	esac
+	if [ ! -e "${dumpdev}" -o ! -d "${dumpdir}" ]; then
+		warn "Wrong dump device or directory. Savecore not run."
+		dumpdev=
+		return 0
+	fi
 	return 0
 }
 
diff --git a/etc/rc.d/securelevel b/etc/rc.d/securelevel
index 961d7bb2d2..2672f70554 100644
--- a/etc/rc.d/securelevel
+++ b/etc/rc.d/securelevel
@@ -2,11 +2,11 @@
 #
 # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/securelevel,v 1.6 2003/05/05 15:38:41 mtm Exp $
-# $DragonFly: src/etc/rc.d/securelevel,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/securelevel,v 1.3 2004/01/27 00:42:46 rob Exp $
 #
 
 # PROVIDE: securelevel
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
@@ -20,46 +20,11 @@ securelevel_start()
 	#
 	/etc/rc.d/sysctl lastload
 
-	case ${OSTYPE} in
-	DragonFly)
-		case ${kern_securelevel_enable} in
-		[Yy][Ee][Ss])
-			if [ ${kern_securelevel} -ge 0 ]; then
-				echo 'Raising kernel security level: '
-				${SYSCTL_W} kern.securelevel=${kern_securelevel}
-			fi
-			;;
-		esac
-		;;
-	FreeBSD)
-		case ${kern_securelevel_enable} in
-		[Yy][Ee][Ss])
-			if [ ${kern_securelevel} -ge 0 ]; then
-				echo 'Raising kernel security level: '
-				${SYSCTL_W} kern.securelevel=${kern_securelevel}
-			fi
-			;;
-		esac
-		;;
-	NetBSD)
-		#	if $securelevel is set higher, change it here, else if
-		#	it is 0, change it to 1 here, before we start daemons
-		#	or login services.
-		#
-		osecurelevel=`sysctl -n kern.securelevel`
-		if [ -n "$securelevel" -a "$securelevel" != "$osecurelevel" ]; then
-			if [ "$securelevel" -lt "$osecurelevel" ]; then
-				echo "Can't lower securelevel."
-				exit 1
-			else
-				echo -n "Setting securelevel: "
-				${SYSCTL_W} kern.securelevel=$securelevel
-			fi
-		else
-			if [ "$osecurelevel" = 0 ]; then
-				echo -n "Setting securelevel: "
-				${SYSCTL_W} kern.securelevel=1
-			fi
+	case ${kern_securelevel_enable} in
+	[Yy][Ee][Ss])
+		if [ ${kern_securelevel} -ge 0 ]; then
+			echo 'Raising kernel security level: '
+			${SYSCTL_W} kern.securelevel=${kern_securelevel}
 		fi
 		;;
 	esac
-- 
2.41.0