From a8ed16819533548dc0612e009f2f67304fd69586 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Fri, 22 Apr 2005 08:30:25 +0000
Subject: [PATCH] Remove RC scripts for stuff we have don't have in our tree.
 Add KEYWORD DragonFly for those we have and which didn't have it. Remove
 mountall, replace it with mountcritremote when necessary. Remove lkm
 dependencies, we don't use it anyway. Run mixer script before LOGIN.

---
 etc/rc.d/Makefile       |  12 +--
 etc/rc.d/accounting     |   4 +-
 etc/rc.d/amd            |   4 +-
 etc/rc.d/bootconf.sh    |  88 ---------------
 etc/rc.d/cleartmp       |   4 +-
 etc/rc.d/downinterfaces |  29 -----
 etc/rc.d/early.sh       |  21 ----
 etc/rc.d/gated          |  19 ----
 etc/rc.d/ipfilter       |   4 +-
 etc/rc.d/ipsec          |   6 +-
 etc/rc.d/kdc            |  21 ----
 etc/rc.d/ldconfig       |   4 +-
 etc/rc.d/lkm1           |  41 -------
 etc/rc.d/lkm2           |  39 -------
 etc/rc.d/lkm3           |  30 ------
 etc/rc.d/mixer          |   6 +-
 etc/rc.d/mopd           |  19 ----
 etc/rc.d/mountall       |  18 ----
 etc/rc.d/mountd         |   4 +-
 etc/rc.d/ndbootd        |  18 ----
 etc/rc.d/network        |   3 +-
 etc/rc.d/newsyslog      |   3 +-
 etc/rc.d/pcvt           | 234 ----------------------------------------
 etc/rc.d/pf             |   4 +-
 etc/rc.d/pflog          |   4 +-
 etc/rc.d/poffd          |  19 ----
 etc/rc.d/postfix        |  43 --------
 etc/rc.d/ppp            |   3 +-
 etc/rc.d/racoon         |  21 ----
 etc/rc.d/rbootd         |  22 ----
 etc/rc.d/routed         |  13 +--
 etc/rc.d/rtsold         |   3 +-
 etc/rc.d/screenblank    |  20 ----
 etc/rc.d/swap2          |  38 -------
 etc/rc.d/syslogd        |   4 +-
 etc/rc.d/wscons         | 171 -----------------------------
 etc/rc.d/xdm            |  21 ----
 etc/rc.d/xfs            |  22 ----
 38 files changed, 40 insertions(+), 999 deletions(-)
 delete mode 100644 etc/rc.d/bootconf.sh
 delete mode 100644 etc/rc.d/downinterfaces
 delete mode 100644 etc/rc.d/early.sh
 delete mode 100644 etc/rc.d/gated
 delete mode 100644 etc/rc.d/kdc
 delete mode 100644 etc/rc.d/lkm1
 delete mode 100644 etc/rc.d/lkm2
 delete mode 100644 etc/rc.d/lkm3
 delete mode 100644 etc/rc.d/mopd
 delete mode 100644 etc/rc.d/mountall
 delete mode 100644 etc/rc.d/ndbootd
 delete mode 100644 etc/rc.d/pcvt
 delete mode 100644 etc/rc.d/poffd
 delete mode 100644 etc/rc.d/postfix
 delete mode 100644 etc/rc.d/racoon
 delete mode 100644 etc/rc.d/rbootd
 delete mode 100644 etc/rc.d/screenblank
 delete mode 100644 etc/rc.d/swap2
 delete mode 100644 etc/rc.d/wscons
 delete mode 100644 etc/rc.d/xdm
 delete mode 100644 etc/rc.d/xfs

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 1e8cb013ae..566ece3edf 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
 # $FreeBSD: src/etc/rc.d/Makefile,v 1.20 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/Makefile,v 1.12 2005/04/15 18:40:52 joerg Exp $
+# $DragonFly: src/etc/rc.d/Makefile,v 1.13 2005/04/22 08:30:25 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -8,19 +8,19 @@
 #
 FILES=	DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz \
 	amd apm apmd archdep atm1 atm2.sh atm3.sh \
-	battd bootconf.sh bootparams ccd cleanvar \
+	battd bootparams ccd cleanvar \
 	cleartmp cron dhclient dhcpd dhcrelay diskless dmesg dumpon fsck \
 	hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \
 	ipnat ipsec ipxrouted isdnd jail \
 	kadmind kerberos keyserv kldxref kpasswdd \
-	ldconfig lkm1 lkm2 lkm3 local localdaemons lpd \
-	mixer motd mountall mountcritlocal mountcritremote \
+	ldconfig local localdaemons lpd \
+	mixer motd mountcritlocal mountcritremote \
 	mountd moused mroute6d mrouted msgs \
 	named netif netoptions network network1 network2 network3 \
 	network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \
-	othermta pcvt pf pflog ppp ppp-user pppoed pwcheck \
+	othermta pf pflog ppp ppp-user pppoed pwcheck \
 	quota random rarpd rcconf.sh resident rndcontrol root route6d routed \
-	routing rpcbind rtadvd rwho sysdb savecore securelevel sendmail \
+	routing rpcbind rtadvd rtsold rwho sysdb savecore securelevel sendmail \
 	serial sppp sshd swap1 syscons sysctl syslogd timed ttys usbd \
 	vinum virecover watchdogd ypbind yppasswdd ypserv ypset ypupdated \
 	ypxfrd varsym wscons
diff --git a/etc/rc.d/accounting b/etc/rc.d/accounting
index ae17ffb15a..6f8413e77a 100644
--- a/etc/rc.d/accounting
+++ b/etc/rc.d/accounting
@@ -2,11 +2,11 @@
 #
 # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/accounting,v 1.4 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/accounting,v 1.3 2004/01/26 17:21:15 rob Exp $
+# $DragonFly: src/etc/rc.d/accounting,v 1.4 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: accounting
-# REQUIRE: mountall
+# REQUIRE: mountcritremote
 # BEFORE: DAEMON
 # KEYWORD: DragonFly 
 
diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index d3b00e1eae..ae6441950b 100644
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@@ -2,11 +2,11 @@
 #
 # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
 # $FreeBSD: src/etc/rc.d/amd,v 1.9 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/amd,v 1.3 2004/01/26 17:21:15 rob Exp $
+# $DragonFly: src/etc/rc.d/amd,v 1.4 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: amd
-# REQUIRE: rpcbind mountall ypbind nfsclient
+# REQUIRE: rpcbind mountcritremote ypbind nfsclient
 # BEFORE: DAEMON
 # KEYWORD: DragonFly 
 
diff --git a/etc/rc.d/bootconf.sh b/etc/rc.d/bootconf.sh
deleted file mode 100644
index 9d7f4316fc..0000000000
--- a/etc/rc.d/bootconf.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: bootconf.sh,v 1.5 2002/03/25 03:22:10 wiz Exp $
-# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.4 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/Attic/bootconf.sh,v 1.2 2003/12/11 23:28:41 dillon Exp $
-#
-
-# PROVIDE: bootconf
-# REQUIRE: mountcritlocal
-
-. /etc/rc.subr
-
-bootconf_start()
-{
-		# Refer to newbtconf(8) for more information
-		#
-
-	if [ ! -e /etc/etc.current ]; then
-		return 0
-	fi
-	if [ -L /etc/etc.default ]; then
-		def=`ls -ld /etc/etc.default 2>&1`
-		default="${def##*-> etc.}"
-	else
-		default=current
-	fi
-	if [ "$default" = "current" ]; then
-		def=`ls -ld /etc/etc.current 2>&1`
-		default="${def##*-> etc.}"
-	fi
-
-	spc=""
-	for i in /etc/etc.*; do
-		name="${i##/etc/etc.}"
-		case $name in
-		current|default|\*)
-			continue
-			;;
-		*)
-			if [ "$name" = "$default" ]; then
-				echo -n "${spc}[${name}]"
-			else
-				echo -n "${spc}${name}"
-			fi
-			spc=" "
-			;;
-		esac
-	done
-	echo
-	master=$$
-	_DUMMY=/etc/passwd
-	conf=${_DUMMY}
-	while [ ! -d /etc/etc.$conf/. ]; do
-		trap "conf=$default; echo; echo Using default of $conf" ALRM
-		echo -n "Which configuration [$default] ? "
-		(sleep 30 && kill -ALRM $master) >/dev/null 2>&1 &
-		read conf
-		trap : ALRM
-		if [ -z $conf ]; then
-			conf=$default
-		fi
-		if [ ! -d /etc/etc.$conf/. ]; then
-			conf=${_DUMMY}
-		fi
-	done
-
-	case  $conf in
-	current|default)
-		;;
-	*)
-		rm -f /etc/etc.current
-		ln -s /etc/etc.$conf /etc/etc.current
-		;;
-	esac
-
-	if [ -f /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
-}
-
-case "$1" in
-*start)
-	bootconf_start
-	;;
-esac
-
-dummy_rc_command $1 XXX
-
diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp
index bae5bd0156..e6b173eaf4 100644
--- a/etc/rc.d/cleartmp
+++ b/etc/rc.d/cleartmp
@@ -2,11 +2,11 @@
 #
 # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/cleartmp,v 1.4 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/cleartmp,v 1.3 2004/01/26 17:21:15 rob Exp $
+# $DragonFly: src/etc/rc.d/cleartmp,v 1.4 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: cleartmp
-# REQUIRE: mountall
+# REQUIRE: mountcritremote
 # BEFORE: DAEMON
 # KEYWORD: DragonFly
 
diff --git a/etc/rc.d/downinterfaces b/etc/rc.d/downinterfaces
deleted file mode 100644
index 124cf36604..0000000000
--- a/etc/rc.d/downinterfaces
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: downinterfaces,v 1.2 2001/09/04 20:40:40 martin Exp $
-# $DragonFly: src/etc/rc.d/Attic/downinterfaces,v 1.2 2003/12/11 23:28:41 dillon Exp $
-#
-
-# PROVIDE: downinterfaces
-# KEYWORD: shutdown
-
-if [ "x$1" != "xstop" ]; then exit 0; fi
-
-. /etc/rc.conf
-dummy_rc_command "$1"
-
-tmp=`ifconfig -lu`
-iflist=""
-for int in $tmp; do
-	case $int in
-	pppoe*)	iflist="$iflist $int"
-		;;
-	esac
-done
-iflist="$iflist $force_down_interfaces"
-if [ "$iflist" = "" ] || [ "$iflist" = " " ]; then exit 0; fi
-
-echo "Shutting down interfaces:$iflist"
-for int in $iflist; do
-	ifconfig $int down
-done
diff --git a/etc/rc.d/early.sh b/etc/rc.d/early.sh
deleted file mode 100644
index fe70f6b2b1..0000000000
--- a/etc/rc.d/early.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: src/etc/rc.d/early.sh,v 1.1 2003/04/24 08:27:29 mtm Exp $
-# $DragonFly: src/etc/rc.d/Attic/early.sh,v 1.3 2004/01/26 17:21:15 rob Exp $
-#
-
-# PROVIDE: early
-# REQUIRE: disks localswap
-# BEFORE:  fsck
-# KEYWORD: DragonFly
-
-#
-# Support for legacy /etc/rc.early script
-#
-if [ -r /etc/rc.early ]; then
-	. /etc/rc.early
-fi
-
-. /etc/rc.subr
-dummy_rc_command "$1"
-
diff --git a/etc/rc.d/gated b/etc/rc.d/gated
deleted file mode 100644
index e0b974c110..0000000000
--- a/etc/rc.d/gated
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: gated,v 1.3 2000/05/13 08:45:06 lukem Exp $
-# $DragonFly: src/etc/rc.d/Attic/gated,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: gated
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="gated"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/${name}.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter
index 8d4fceef43..196b268bbe 100644
--- a/etc/rc.d/ipfilter
+++ b/etc/rc.d/ipfilter
@@ -2,11 +2,11 @@
 #
 # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
 # $FreeBSD: src/etc/rc.d/ipfilter,v 1.10 2003/04/30 02:54:17 mtm Exp $
-# $DragonFly: src/etc/rc.d/ipfilter,v 1.4 2005/02/25 18:14:38 hmp Exp $
+# $DragonFly: src/etc/rc.d/ipfilter,v 1.5 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: ipfilter
-# REQUIRE: root beforenetlkm mountcritlocal tty ipmon
+# REQUIRE: root mountcritlocal tty ipmon
 # BEFORE:  netif
 # KEYWORD: DragonFly nojail
 
diff --git a/etc/rc.d/ipsec b/etc/rc.d/ipsec
index 5698e36ef2..ffa077b9d4 100644
--- a/etc/rc.d/ipsec
+++ b/etc/rc.d/ipsec
@@ -2,16 +2,14 @@
 #
 # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/ipsec,v 1.5 2003/02/16 20:46:08 mtm Exp $
-# $DragonFly: src/etc/rc.d/ipsec,v 1.3 2004/01/26 17:21:15 rob Exp $
+# $DragonFly: src/etc/rc.d/ipsec,v 1.4 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: ipsec
-# REQUIRE: root beforenetlkm mountcritlocal tty
+# REQUIRE: root mountcritlocal tty
 # BEFORE:  DAEMON
 # KEYWORD: DragonFly 
 
-#	it does not really require beforenetlkm.
-
 . /etc/rc.subr
 
 name="ipsec"
diff --git a/etc/rc.d/kdc b/etc/rc.d/kdc
deleted file mode 100644
index 0e25083bad..0000000000
--- a/etc/rc.d/kdc
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: kdc,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/kdc,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/kdc,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: kdc
-# REQUIRE: NETWORKING
-# BEFORE:  SERVERS
-
-. /etc/rc.subr
-
-name="kdc"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/krb5.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index 11f8582d7f..c2754945cf 100644
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@@ -2,11 +2,11 @@
 #
 # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/ldconfig,v 1.7 2003/06/30 15:02:05 trhodes Exp $
-# $DragonFly: src/etc/rc.d/ldconfig,v 1.5 2004/03/20 16:27:39 drhodus Exp $
+# $DragonFly: src/etc/rc.d/ldconfig,v 1.6 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: ldconfig
-# REQUIRE: mountall mountcritremote
+# REQUIRE: mountcritremote
 # BEFORE:  DAEMON
 # KEYWORD: DragonFly
 
diff --git a/etc/rc.d/lkm1 b/etc/rc.d/lkm1
deleted file mode 100644
index 07ece30b4b..0000000000
--- a/etc/rc.d/lkm1
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: lkm1,v 1.6 2000/10/09 06:11:38 nisimura Exp $
-# $FreeBSD: src/etc/rc.d/lkm1,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/lkm1,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: beforenetlkm
-# REQUIRE: root bootconf
-
-. /etc/rc.subr
-
-name="lkm1"
-rcvar="lkm"
-start_cmd="lkm1_start"
-stop_cmd="lkm1_stop"
-
-lkm1_start()
-{
-#		load kernel modules specified in /etc/lkm.conf if the /usr
-#		filesystem is already present with "/" or can be mounted now
-#
-	if [ -f /etc/rc.lkm ]; then
-		mount /usr >/dev/null 2>&1
-		if [ -x /usr/bin/ld ]; then
-			lkmstage=BEFORENET
-			set start ; . /etc/rc.lkm
-		fi
-	fi
-}
-
-lkm1_stop()
-{
-	if [ -f /etc/rc.lkm ] && [ -x /usr/bin/ld ]; then
-		lkmstage=BEFORENET
-		set stop ; . /etc/rc.lkm
-	fi
-}
-
-load_rc_config lkm
-run_rc_command "$1"
diff --git a/etc/rc.d/lkm2 b/etc/rc.d/lkm2
deleted file mode 100644
index b2c3b43fc6..0000000000
--- a/etc/rc.d/lkm2
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: lkm2,v 1.4 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/lkm2,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/lkm2,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: beforemountlkm
-# REQUIRE: syslogd
-
-. /etc/rc.subr
-
-name="lkm2"
-rcvar="lkm"
-start_cmd="lkm2_start"
-stop_cmd="lkm2_stop"
-
-#		load kernel modules specified in /etc/lkm.conf
-#
-lkm2_start()
-{
-	if [ -r /etc/rc.lkm ]; then
-		lkmstage=BEFOREMOUNT
-		set start ; . /etc/rc.lkm
-	else
-		warn "/etc/rc.lkm not found; LKMs not loaded."
-	fi
-}
-
-lkm2_stop()
-{
-	if [ -r /etc/rc.lkm ]; then
-		lkmstage=BEFOREMOUNT
-		set stop ; . /etc/rc.lkm
-	fi
-}
-
-load_rc_config lkm
-run_rc_command "$1"
diff --git a/etc/rc.d/lkm3 b/etc/rc.d/lkm3
deleted file mode 100644
index 394520eca1..0000000000
--- a/etc/rc.d/lkm3
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: lkm3,v 1.6 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/lkm3,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/lkm3,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: aftermountlkm
-# REQUIRE: mountall
-# BEFORE:  DAEMON
-
-. /etc/rc.subr
-
-name="lkm3"
-rcvar="lkm"
-start_cmd="do_lkm3 start"
-stop_cmd="do_lkm3 stop"
-
-do_lkm3()
-{
-	#	(un)load kernel modules specified in /etc/lkm.conf
-	#
-	if [ -f /etc/rc.lkm ]; then
-		lkmstage=AFTERMOUNT
-		set $1 ; . /etc/rc.lkm
-	fi
-}
-
-load_rc_config lkm
-run_rc_command "$1"
diff --git a/etc/rc.d/mixer b/etc/rc.d/mixer
index 261e0532a2..7c9d82c267 100644
--- a/etc/rc.d/mixer
+++ b/etc/rc.d/mixer
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# $DragonFly: src/etc/rc.d/mixer,v 1.5 2004/11/08 18:33:17 joerg Exp $
+# $DragonFly: src/etc/rc.d/mixer,v 1.6 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: mixer
-# REQUIRE: aftermountlkm
+# REQUIRE: DAEMON
+# BEFORE:  LOGIN
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/mopd b/etc/rc.d/mopd
deleted file mode 100644
index c1f478980f..0000000000
--- a/etc/rc.d/mopd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: mopd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/mopd,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/mopd,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: mopd
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-. /etc/rc.subr
-
-name="mopd"
-rcvar=$name
-command="/usr/sbin/${name}"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/mountall b/etc/rc.d/mountall
deleted file mode 100644
index 90aca5faa4..0000000000
--- a/etc/rc.d/mountall
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: mountall,v 1.3 2000/05/13 08:45:07 lukem Exp $
-# $FreeBSD: src/etc/rc.d/mountall,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/mountall,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: mountall
-# REQUIRE: beforemountlkm
-
-. /etc/rc.subr
-
-name="mountall"
-start_cmd="echo 'Mounting all filesystems...'; mount -a"
-stop_cmd="echo 'Unmounting all filesystems...'; umount -a"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd
index 29296a3295..151db7b8d2 100644
--- a/etc/rc.d/mountd
+++ b/etc/rc.d/mountd
@@ -2,11 +2,11 @@
 #
 # $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.4 2004/01/27 00:42:45 rob Exp $
+# $DragonFly: src/etc/rc.d/mountd,v 1.5 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: mountd
-# REQUIRE: NETWORKING mountall beforemountlkm nfsserver rpcbind quota
+# REQUIRE: NETWORKING mountcritremote nfsserver rpcbind quota
 # KEYWORD: DragonFly 
 
 . /etc/rc.subr
diff --git a/etc/rc.d/ndbootd b/etc/rc.d/ndbootd
deleted file mode 100644
index ee7b0e3a5a..0000000000
--- a/etc/rc.d/ndbootd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $DragonFly: src/etc/rc.d/Attic/ndbootd,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: ndbootd
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="ndbootd"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/ethers"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/network b/etc/rc.d/network
index 9a30f24818..5d5dd1b1c4 100644
--- a/etc/rc.d/network
+++ b/etc/rc.d/network
@@ -2,10 +2,11 @@
 #
 # $NetBSD: network,v 1.29 2001/01/11 17:56:16 itojun Exp $
 # $FreeBSD: src/etc/rc.d/network,v 1.3 2002/08/12 10:04:32 schweikh Exp $
-# $DragonFly: src/etc/rc.d/Attic/network,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/network,v 1.2 2005/04/22 08:30:25 joerg Exp $
 
 # PROVIDE: network
 # REQUIRE: ipfilter ipsec mountcritlocal root tty sysctl
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/newsyslog b/etc/rc.d/newsyslog
index 8d071f053f..c7925186aa 100644
--- a/etc/rc.d/newsyslog
+++ b/etc/rc.d/newsyslog
@@ -2,12 +2,13 @@
 #
 # $NetBSD: newsyslog,v 1.5 2002/03/24 15:51:26 lukem Exp $
 # $FreeBSD: src/etc/rc.d/newsyslog,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/newsyslog,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/newsyslog,v 1.2 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: newsyslog
 # REQUIRE: mountcritremote sysdb
 # BEFORE:  syslogd SERVERS
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/pcvt b/etc/rc.d/pcvt
deleted file mode 100644
index c12454965d..0000000000
--- a/etc/rc.d/pcvt
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/sh -
-#
-# Copyright (c) 2002  The FreeBSD Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# 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.2 2004/01/27 00:42:45 rob Exp $
-#
-
-# PROVIDE: pcvt
-# REQUIRE: LOGIN
-# KEYWORD: DragonFly
-
-. /etc/rc.subr
-
-name="pcvt"
-start_precmd="pcvt_precmd"
-start_cmd="pcvt_start"
-
-pcvt_precmd()
-{
-	if [ -x /usr/sbin/ispcvt ]; then
-		/usr/sbin/ispcvt -d /dev/ttyv0 && return 0
-	fi
-	return 1
-}
-
-pcvt_echo()
-{
-	if checkyesno pcvt_verbose; then
-		echo $1 "$2"
-	fi
-}
-
-pcvt_start()
-{
-	# path for pcvt's EGA/VGA download fonts
-	FONTP=/usr/share/misc/pcvtfonts
-
-	if checkyesno pcvt_verbose; then
-		echo "Configuring pcvt console driver:"
-	else
-		echo "-n" "Configuring pcvt"
-	fi
-
-	# video adapter type
-
-	adapter=`/usr/sbin/scon -d /dev/ttyv0 -a`
-
-	pcvt_echo "-n" "  video adapter type is $adapter, "
-
-	# monitor type (mono/color)
-
-	monitor=`/usr/sbin/scon -d /dev/ttyv0 -m`
-
-	pcvt_echo "" "monitor type is $monitor"
-
-	# load fonts into VGA
-
-	if [ $adapter = VGA ]; then
-		pcvt_echo "-n" "  loading fonts: 8x16:0,"
-		loadfont -d /dev/ttyv0 -c0 -f $FONTP/vt220l.816
-
-		pcvt_echo "-n" "1 "
-		loadfont -d /dev/ttyv0 -c1 -f $FONTP/vt220h.816
-
-		pcvt_echo "-n" " 8x14:0,"
-		loadfont -d /dev/ttyv0 -c2 -f $FONTP/vt220l.814
-
-		pcvt_echo "-n" "1 "
-		loadfont -d /dev/ttyv0 -c3 -f $FONTP/vt220h.814
-
-		pcvt_echo "-n" " 8x10:0,"
-		loadfont -d /dev/ttyv0 -c4 -f $FONTP/vt220l.810
-
-		pcvt_echo "-n" "1 "
-		loadfont -d /dev/ttyv0 -c5 -f $FONTP/vt220h.810
-
-		pcvt_echo "-n" " 8x8:0,"
-		loadfont -d /dev/ttyv0 -c6 -f $FONTP/vt220l.808
-
-		pcvt_echo "" "1 "
-		loadfont -d /dev/ttyv0 -c7 -f $FONTP/vt220h.808
-
-	# setting screen sizes
-
-		case ${pcvt_lines} in
-		28)
-			size=-s28
-			pcvt_echo "" "  switching to 28 lines"
-			;;
-		40)
-			size=-s40
-			pcvt_echo "" "  switching to 40 lines"
-			;;
-		50)
-			size=-s50
-			pcvt_echo "" "  switching to 50 lines"
-			;;
-		*)
-			size=-s25
-			pcvt_echo "" "  switching to 25 lines"
-			;;
-		esac
-	fi
-
-	# use HP extensions to VT220 or plain VT220 ?
-
-	if checkyesno pcvt_hpext; then
-		emulation=-H
-		pcvt_echo "" "  setting emulation to VT220 with HP extensions"
-	else
-		emulation=-V
-		pcvt_echo "" "  setting emulation to VT220"
-	fi
-
-	# for all screens do
-
-	for device in /dev/ttyv*
-	do
-		# set emulation
-
-		/usr/sbin/scon -d$device $size $emulation >/dev/null 2>&1
-		if [ $? != 0 ]; then
-			break 1
-		fi
-
-		# set cursor shape
-
-		case ${pcvt_cursorh} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			case ${pcvt_cursorl} in
-			[Nn][Oo] | '')
-				;;
-			*)
-				/usr/sbin/cursor -d$device -s$pcvt_cursorh -e$pcvt_cursorl
-				;;
-			esac
-			;;
-		esac
-
-		# on monochrome monitor, set color palette to use a higher intensity
-
-		if checkyesno pcvt_monohigh && \
-			[ $monitor = MONO -a $adapter = VGA ]
-		then
-			/usr/sbin/scon -d$device -p8,60,60,60
-		fi
-	done
-
-	# switch to screen 0
-
-	pcvt_echo "" "  switching to screen 0"
-
-	/usr/sbin/scon -d /dev/ttyv0
-
-	# screensaver timeout
-
-	case ${pcvt_blanktime} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		pcvt_echo "" "  setting screensaver timeout to $pcvt_blanktime seconds"
-		/usr/sbin/scon -d /dev/ttyv0 -t$pcvt_blanktime
-		;;
-	esac
-
-	# national keyboard layout
-
-	case ${pcvt_keymap} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		pcvt_echo "" "  switching national keyboard layout to $pcvt_keymap"
-		/usr/sbin/kcon -m $pcvt_keymap
-		;;
-	esac
-
-	# keyboard repeat delay value
-
-	case ${pcvt_keydel} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		pcvt_echo "" "  setting keyboard delay to $pcvt_keydel"
-		/usr/sbin/kcon -d$pcvt_keydel
-		;;
-	esac
-
-	# keyboard repeat rate value
-
-	case ${pcvt_keyrate} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		pcvt_echo "" "  setting keyboard repeat rate to $pcvt_keyrate"
-		/usr/sbin/kcon -r$pcvt_keyrate
-		;;
-	esac
-
-	# done
-
-	if checkyesno pcvt_verbose; then
-		echo "Finished configuring pcvt console driver."
-	else
-		echo "."
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/pf b/etc/rc.d/pf
index 612797e98b..730c0bec97 100644
--- a/etc/rc.d/pf
+++ b/etc/rc.d/pf
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/pf,v 1.3 2004/06/23 01:42:06 mlaier Exp $
-# $DragonFly: src/etc/rc.d/pf,v 1.1 2004/09/21 21:25:28 joerg Exp $
+# $DragonFly: src/etc/rc.d/pf,v 1.2 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: pf
-# REQUIRE: root beforenetlkm mountcritlocal netif pflog
+# REQUIRE: root mountcritlocal netif pflog
 # BEFORE:  DAEMON LOGIN
 # KEYWORD: DragonFly nojail
 
diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog
index 86bc695e58..dbfc741ce5 100644
--- a/etc/rc.d/pflog
+++ b/etc/rc.d/pflog
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/pflog,v 1.2 2004/08/31 14:23:51 mlaier Exp $
-# $DragonFly: src/etc/rc.d/pflog,v 1.2 2005/02/16 19:42:35 corecode Exp $
+# $DragonFly: src/etc/rc.d/pflog,v 1.3 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: pflog
-# REQUIRE: root beforenetlkm mountcritlocal netif
+# REQUIRE: root mountcritlocal netif
 # BEFORE:  DAEMON LOGIN
 # KEYWORD: DragonFly nojail
 
diff --git a/etc/rc.d/poffd b/etc/rc.d/poffd
deleted file mode 100644
index 31fcca3997..0000000000
--- a/etc/rc.d/poffd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: poffd,v 1.1 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/poffd,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/poffd,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: poffd
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="poffd"
-rcvar=$name
-command="/usr/sbin/${name}"
-start_precmd="test -c /dev/pow0"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/postfix b/etc/rc.d/postfix
deleted file mode 100644
index 96f0c8d0c1..0000000000
--- a/etc/rc.d/postfix
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: postfix,v 1.6 2002/02/12 02:19:27 lukem Exp $
-# $FreeBSD: src/etc/rc.d/postfix,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/postfix,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: mail
-# REQUIRE: LOGIN
-#	we make mail start late, so that things like .forward's are not
-#	processed until the system is fully operational
-
-. /etc/rc.subr
-
-name="postfix"
-rcvar=$name
-required_files="/etc/${name}/main.cf"
-start_precmd="postfix_precmd"
-start_cmd="${name} start"
-stop_cmd="${name} stop"
-reload_cmd="${name} reload"
-extra_commands="reload"
-spooletcdir="/var/spool/${name}/etc"
-required_dirs=$spooletcdir
-
-postfix_precmd()
-{
-	# As this is called after the is_running and required_dir checks
-	# are made in run_rc_command(), we can safely assume ${spooletcdir}
-	# exists and postfix isn't running at this point (unless forcestart
-	# is used).
-	#
-
-	for f in localtime resolv.conf services; do
-		if [ -f /etc/$f ]; then
-			cmp -s /etc/$f ${spooletcdir}/$f || \
-			    cp -p /etc/$f ${spooletcdir}/$f
-		fi
-	done
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/ppp b/etc/rc.d/ppp
index ca6e181612..08f2b0f31c 100644
--- a/etc/rc.d/ppp
+++ b/etc/rc.d/ppp
@@ -2,12 +2,13 @@
 #
 # $NetBSD: ppp,v 1.6 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/ppp,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/ppp,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/ppp,v 1.2 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: ppp
 # REQUIRE: mountcritremote syslogd
 # BEFORE:  SERVERS
+# KEYWORD: DragonFly
 #
 #	Note that this means that syslogd will not be listening on
 #	any PPP addresses.  This is considered a feature.
diff --git a/etc/rc.d/racoon b/etc/rc.d/racoon
deleted file mode 100644
index 441024f28c..0000000000
--- a/etc/rc.d/racoon
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: racoon,v 1.3 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/racoon,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/racoon,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: ike
-# REQUIRE: isdnd kdc ppp
-# BEFORE:  SERVERS
-
-. /etc/rc.subr
-
-name="racoon"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/racoon/racoon.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/rbootd b/etc/rc.d/rbootd
deleted file mode 100644
index 814f870765..0000000000
--- a/etc/rc.d/rbootd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: rbootd,v 1.6 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/rbootd,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/rbootd,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: rbootd
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-. /etc/rc.subr
-
-name="rbootd"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/${name}.conf"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/routed b/etc/rc.d/routed
index 6a72eaaf7c..5cb39973c3 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.3 2004/01/27 00:42:45 rob Exp $
+# $DragonFly: src/etc/rc.d/routed,v 1.4 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: routed
@@ -20,16 +20,7 @@ name="routed"
 load_rc_config $name
 
 rcvar="router_enable"
-command="${router:-/sbin/${name}}"
+command="/sbin/${name}"
 eval ${name}_flags=${router_flags}
-start_precmd=
-
-routed_precmd()
-{
-	if checkyesno gated && checkyesno routed; then
-		warn "gated and routed both requested to be run: only running gated."
-		return 1
-	fi
-}
 
 run_rc_command "$1"
diff --git a/etc/rc.d/rtsold b/etc/rc.d/rtsold
index 81ce99f3eb..f79c3892a8 100644
--- a/etc/rc.d/rtsold
+++ b/etc/rc.d/rtsold
@@ -2,12 +2,13 @@
 #
 # $NetBSD: rtsold,v 1.5 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/rtsold,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/rtsold,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/rtsold,v 1.2 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: rtsold
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/screenblank b/etc/rc.d/screenblank
deleted file mode 100644
index 76f6d55d93..0000000000
--- a/etc/rc.d/screenblank
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: screenblank,v 1.5 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/screenblank,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/screenblank,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: screenblank
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-. /etc/rc.subr
-
-name="screenblank"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/swap2 b/etc/rc.d/swap2
deleted file mode 100644
index c48a18e400..0000000000
--- a/etc/rc.d/swap2
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: swap2,v 1.6 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/swap2,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/swap2,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: nonlocalswap
-# REQUIRE: mountcritremote
-# BEFORE:  DAEMON
-
-. /etc/rc.subr
-
-name="swap2"
-start_cmd="swap2_start"
-
-swap2_start()
-{
-	#	"Critical" file systems are now mounted.  Go ahead and swap
-	#	to files now, since they will be residing in the critical file
-	#	systems (or, at least, they should be...).
-	#	Check for no swap, and warn about it unless that is desired.
-	#
-	swapctl -A -t noblk;
-	if ! checkyesno no_swap; then
-		if swapctl -s | grep "no swap devices configured" > /dev/null;
-		then
-			warn "No swap space configured!"
-		fi
-	fi
-}
-
-#		Remove all non-block-type swap devices
-#
-stop_cmd="swapctl -U -t noblk"
-
-load_rc_config swap
-run_rc_command "$1"
diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd
index 987ecb9ab9..2aca96c19b 100644
--- a/etc/rc.d/syslogd
+++ b/etc/rc.d/syslogd
@@ -2,11 +2,11 @@
 #
 # $NetBSD: syslogd,v 1.12 2002/03/22 04:34:00 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/syslogd,v 1.4 2002/10/01 13:29:44 ru Exp $
-# $DragonFly: src/etc/rc.d/syslogd,v 1.4 2005/02/20 21:51:22 joerg Exp $
+# $DragonFly: src/etc/rc.d/syslogd,v 1.5 2005/04/22 08:30:25 joerg Exp $
 #
 
 # PROVIDE: syslogd
-# REQUIRE: mountcritremote sysdb wscons
+# REQUIRE: mountcritremote sysdb
 # BEFORE:  SERVERS
 # KEYWORD: DragonFly
 
diff --git a/etc/rc.d/wscons b/etc/rc.d/wscons
deleted file mode 100644
index 1a9c804313..0000000000
--- a/etc/rc.d/wscons
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: wscons,v 1.9 2002/04/26 00:06:54 lukem Exp $
-# $FreeBSD: src/etc/rc.d/wscons,v 1.4 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/Attic/wscons,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: wscons
-# REQUIRE: mountcritremote
-# BEFORE:  LOGIN
-
-. /etc/rc.subr
-
-name="wscons"
-rcvar=$name
-start_cmd="wscons_start"
-stop_cmd=":"
-
-wscons_start()
-{
-	wscfg=/usr/sbin/wsconscfg
-	wsfld=/usr/sbin/wsfontload
-	wsctl=/sbin/wsconsctl
-	config=/etc/wscons.conf
-	usage="Usage: wsconfig [-n] [-f configfile] [-font fontpgm] [-screen screenpgm]"
-	DOIT=
-
-	while [ $# -gt 0 ]; do
-		case $1 in
-			-n)
-				DOIT=echo
-				;;
-			-f)
-				config=$2
-				shift
-				;;
-			-font)
-				wsfld=$2
-				shift
-				;;
-			-screen)
-				wscfg=$2
-				shift
-				;;
-			*)
-				echo $usage
-				exit 1
-				;;
-		esac
-		shift
-	done
-
-
-	# args mean:
-	#	screen idx scr emul
-	#	font   name width height enc file
-	( while read type arg1 arg2 arg3 arg4 arg5; do
-		case "$type" in
-			\#*|"")
-				continue
-				;;
-
-			font)
-				name=$arg1
-				width=$arg2
-				height=$arg3
-				enc=$arg4
-				file=$arg5
-				cmd=$wsfld
-
-				case $width in
-					-)
-						;;
-					*)
-						cmd="$cmd -w $width"
-						;;
-				esac
-				case $height in
-					-)
-						;;
-					*)
-						cmd="$cmd -h $height"
-						;;
-				esac
-				case $enc in
-					-)
-						;;
-					*)
-						cmd="$cmd -e $enc"
-						;;
-				esac
-				cmd="$cmd -N $name $file"
-				eval $DOIT $cmd
-				;;
-
-			screen)
-				idx=$arg1
-				scr=$arg2
-				emul=$arg3
-				cmd=$wscfg
-
-				case $scr in
-					-)
-						;;
-					*)
-						cmd="$cmd -t $scr"
-						;;
-				esac
-				case $emul in
-					-)
-						;;
-					*)
-						cmd="$cmd -e $emul"
-						;;
-				esac
-				cmd="$cmd $idx"
-				eval $DOIT $cmd
-				;;
-
-			keyboard)
-				kbd=$arg1
-				cmd=$wscfg
-				case $kbd in
-					-|auto)
-						cmd="$cmd -k"
-						;;
-					*)
-						cmd="$cmd -k $kbd"
-						;;
-				esac
-				eval $DOIT $cmd
-				;;
-
-			encoding)
-				map=$arg1
-				cmd="$wsctl -w \"encoding=$map\""
-				eval $DOIT $cmd
-				;;
-
-			mapfile)
-				mapfile=$arg1
-				( while read entry; do
-					case "$entry" in
-						\#*|"")
-						continue
-						;;
-					*)
-						cmd="$wsctl -w \"map+=$entry\""
-						cmd="$cmd >/dev/null"
-						eval $DOIT $cmd
-						;;
-					esac
-				done ) < $mapfile
-				;;
-
-			mux)
-				cmd="$wscfg -m $arg1"
-				eval $DOIT $cmd
-				;;
-
-			setvar)
-				cmd="$wsctl -w $arg1"
-				eval $DOIT $cmd
-				;;
-
-		esac
-	done ) < $config
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/xdm b/etc/rc.d/xdm
deleted file mode 100644
index 51737ad8bf..0000000000
--- a/etc/rc.d/xdm
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: xdm,v 1.5 2000/07/17 15:24:48 lukem Exp $
-# $DragonFly: src/etc/rc.d/Attic/xdm,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: xdm
-# REQUIRE: DAEMON LOGIN wscons
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="xdm"
-rcvar=$name
-command="/usr/X11R6/bin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/usr/X11R6/lib/X11/xdm/xdm-config"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/xfs b/etc/rc.d/xfs
deleted file mode 100644
index 247b1f100f..0000000000
--- a/etc/rc.d/xfs
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: xfs,v 1.6 2002/03/22 04:34:01 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/xfs,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/xfs,v 1.1 2003/07/24 06:35:37 dillon Exp $
-#
-
-# PROVIDE: xfs
-# REQUIRE: mountall cleartmp
-# BEFORE:  LOGIN
-
-. /etc/rc.subr
-
-name="xfs"
-rcvar=$name
-command="/usr/X11R6/bin/${name}"
-command_args="& sleep 2"
-required_files="/usr/X11R6/lib/X11/fs/config"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
-- 
2.41.0