From 1135e97b7c2c3b60fda9a6f2f4a24a8336b1024c Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Sat, 28 Jul 2018 20:36:23 +0000
Subject: [PATCH] Move rc startup scripts from etc/ to sbin/init/

This keeps most startup scripts as CONFS per discussion on src-committers from
back during BSDCan.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16466
---
 etc/Makefile                               | 11 ---
 etc/defaults/Makefile                      |  2 +-
 sbin/init/Makefile                         | 11 +++
 {etc => sbin/init}/rc.d/DAEMON             |  0
 {etc => sbin/init}/rc.d/FILESYSTEMS        |  0
 {etc => sbin/init}/rc.d/LOGIN              |  0
 {etc => sbin/init}/rc.d/Makefile           | 98 +++++++++++-----------
 {etc => sbin/init}/rc.d/NETWORKING         |  0
 {etc => sbin/init}/rc.d/SERVERS            |  0
 {etc => sbin/init}/rc.d/abi                |  0
 {etc => sbin/init}/rc.d/accounting         |  0
 {etc => sbin/init}/rc.d/addswap            |  0
 {etc => sbin/init}/rc.d/adjkerntz          |  0
 {etc => sbin/init}/rc.d/amd                |  0
 {etc => sbin/init}/rc.d/apm                |  0
 {etc => sbin/init}/rc.d/apmd               |  0
 {etc => sbin/init}/rc.d/archdep            |  0
 {etc => sbin/init}/rc.d/auditd             |  0
 {etc => sbin/init}/rc.d/auditdistd         |  0
 {etc => sbin/init}/rc.d/automount          |  0
 {etc => sbin/init}/rc.d/automountd         |  0
 {etc => sbin/init}/rc.d/autounmountd       |  0
 {etc => sbin/init}/rc.d/bgfsck             |  0
 {etc => sbin/init}/rc.d/blacklistd         |  0
 {etc => sbin/init}/rc.d/bluetooth          |  0
 {etc => sbin/init}/rc.d/bootparams         |  0
 {etc => sbin/init}/rc.d/bridge             |  0
 {etc => sbin/init}/rc.d/bsnmpd             |  0
 {etc => sbin/init}/rc.d/bthidd             |  0
 {etc => sbin/init}/rc.d/ccd                |  0
 {etc => sbin/init}/rc.d/cfumass            |  0
 {etc => sbin/init}/rc.d/cleanvar           |  0
 {etc => sbin/init}/rc.d/cleartmp           |  0
 {etc => sbin/init}/rc.d/cron               |  0
 {etc => sbin/init}/rc.d/ctld               |  0
 {etc => sbin/init}/rc.d/ddb                |  0
 {etc => sbin/init}/rc.d/defaultroute       |  0
 {etc => sbin/init}/rc.d/devd               |  0
 {etc => sbin/init}/rc.d/devfs              |  0
 {etc => sbin/init}/rc.d/devmatch           |  0
 {etc => sbin/init}/rc.d/dhclient           |  0
 {etc => sbin/init}/rc.d/dmesg              |  0
 {etc => sbin/init}/rc.d/dumpon             |  0
 {etc => sbin/init}/rc.d/fsck               |  0
 {etc => sbin/init}/rc.d/ftp-proxy          |  0
 {etc => sbin/init}/rc.d/ftpd               |  0
 {etc => sbin/init}/rc.d/gbde               |  0
 {etc => sbin/init}/rc.d/geli               |  0
 {etc => sbin/init}/rc.d/geli2              |  0
 {etc => sbin/init}/rc.d/gptboot            |  0
 {etc => sbin/init}/rc.d/growfs             |  0
 {etc => sbin/init}/rc.d/gssd               |  0
 {etc => sbin/init}/rc.d/hastd              |  0
 {etc => sbin/init}/rc.d/hcsecd             |  0
 {etc => sbin/init}/rc.d/hostapd            |  0
 {etc => sbin/init}/rc.d/hostid             |  0
 {etc => sbin/init}/rc.d/hostid_save        |  0
 {etc => sbin/init}/rc.d/hostname           |  0
 {etc => sbin/init}/rc.d/inetd              |  0
 {etc => sbin/init}/rc.d/iovctl             |  0
 {etc => sbin/init}/rc.d/ip6addrctl         |  0
 {etc => sbin/init}/rc.d/ipfilter           |  0
 {etc => sbin/init}/rc.d/ipfs               |  0
 {etc => sbin/init}/rc.d/ipfw               |  0
 {etc => sbin/init}/rc.d/ipfw_netflow       |  0
 {etc => sbin/init}/rc.d/ipmon              |  0
 {etc => sbin/init}/rc.d/ipnat              |  0
 {etc => sbin/init}/rc.d/ipropd_master      |  0
 {etc => sbin/init}/rc.d/ipropd_slave       |  0
 {etc => sbin/init}/rc.d/ipsec              |  0
 {etc => sbin/init}/rc.d/iscsictl           |  0
 {etc => sbin/init}/rc.d/iscsid             |  0
 {etc => sbin/init}/rc.d/jail               |  0
 {etc => sbin/init}/rc.d/kadmind            |  0
 {etc => sbin/init}/rc.d/kdc                |  0
 {etc => sbin/init}/rc.d/keyserv            |  0
 {etc => sbin/init}/rc.d/kfd                |  0
 {etc => sbin/init}/rc.d/kld                |  0
 {etc => sbin/init}/rc.d/kldxref            |  0
 {etc => sbin/init}/rc.d/kpasswdd           |  0
 {etc => sbin/init}/rc.d/ldconfig           |  0
 {etc => sbin/init}/rc.d/local              |  0
 {etc => sbin/init}/rc.d/local_unbound      |  0
 {etc => sbin/init}/rc.d/localpkg           |  0
 {etc => sbin/init}/rc.d/lockd              |  0
 {etc => sbin/init}/rc.d/lpd                |  0
 {etc => sbin/init}/rc.d/mdconfig           |  0
 {etc => sbin/init}/rc.d/mdconfig2          |  0
 {etc => sbin/init}/rc.d/mixer              |  0
 {etc => sbin/init}/rc.d/motd               |  0
 {etc => sbin/init}/rc.d/mountcritlocal     |  0
 {etc => sbin/init}/rc.d/mountcritremote    |  0
 {etc => sbin/init}/rc.d/mountd             |  0
 {etc => sbin/init}/rc.d/mountlate          |  0
 {etc => sbin/init}/rc.d/moused             |  0
 {etc => sbin/init}/rc.d/msgs               |  0
 {etc => sbin/init}/rc.d/natd               |  0
 {etc => sbin/init}/rc.d/netif              |  0
 {etc => sbin/init}/rc.d/netoptions         |  0
 {etc => sbin/init}/rc.d/netwait            |  0
 {etc => sbin/init}/rc.d/newsyslog          |  0
 {etc => sbin/init}/rc.d/nfscbd             |  0
 {etc => sbin/init}/rc.d/nfsclient          |  0
 {etc => sbin/init}/rc.d/nfsd               |  0
 {etc => sbin/init}/rc.d/nfsuserd           |  0
 {etc => sbin/init}/rc.d/nisdomain          |  0
 {etc => sbin/init}/rc.d/nscd               |  0
 {etc => sbin/init}/rc.d/nsswitch           |  0
 {etc => sbin/init}/rc.d/ntpd               |  0
 {etc => sbin/init}/rc.d/ntpdate            |  0
 {etc => sbin/init}/rc.d/opensm             |  0
 {etc => sbin/init}/rc.d/othermta           |  0
 {etc => sbin/init}/rc.d/pf                 |  0
 {etc => sbin/init}/rc.d/pflog              |  0
 {etc => sbin/init}/rc.d/pfsync             |  0
 {etc => sbin/init}/rc.d/power_profile      |  0
 {etc => sbin/init}/rc.d/powerd             |  0
 {etc => sbin/init}/rc.d/ppp                |  0
 {etc => sbin/init}/rc.d/pppoed             |  0
 {etc => sbin/init}/rc.d/pwcheck            |  0
 {etc => sbin/init}/rc.d/quota              |  0
 {etc => sbin/init}/rc.d/random             |  0
 {etc => sbin/init}/rc.d/rarpd              |  0
 {etc => sbin/init}/rc.d/rctl               |  0
 {etc => sbin/init}/rc.d/resolv             |  0
 {etc => sbin/init}/rc.d/rfcomm_pppd_server |  0
 {etc => sbin/init}/rc.d/root               |  0
 {etc => sbin/init}/rc.d/route6d            |  0
 {etc => sbin/init}/rc.d/routed             |  0
 {etc => sbin/init}/rc.d/routing            |  0
 {etc => sbin/init}/rc.d/rpcbind            |  0
 {etc => sbin/init}/rc.d/rtadvd             |  0
 {etc => sbin/init}/rc.d/rtsold             |  0
 {etc => sbin/init}/rc.d/rwho               |  0
 {etc => sbin/init}/rc.d/savecore           |  0
 {etc => sbin/init}/rc.d/sdpd               |  0
 {etc => sbin/init}/rc.d/securelevel        |  0
 {etc => sbin/init}/rc.d/sendmail           |  0
 {etc => sbin/init}/rc.d/serial             |  0
 {etc => sbin/init}/rc.d/sppp               |  0
 {etc => sbin/init}/rc.d/sshd               |  0
 {etc => sbin/init}/rc.d/statd              |  0
 {etc => sbin/init}/rc.d/static_arp         |  0
 {etc => sbin/init}/rc.d/static_ndp         |  0
 {etc => sbin/init}/rc.d/stf                |  0
 {etc => sbin/init}/rc.d/swap               |  0
 {etc => sbin/init}/rc.d/swaplate           |  0
 {etc => sbin/init}/rc.d/syscons            |  0
 {etc => sbin/init}/rc.d/sysctl             |  0
 {etc => sbin/init}/rc.d/syslogd            |  0
 {etc => sbin/init}/rc.d/timed              |  0
 {etc => sbin/init}/rc.d/tmp                |  0
 {etc => sbin/init}/rc.d/ubthidhci          |  0
 {etc => sbin/init}/rc.d/ugidfw             |  0
 {etc => sbin/init}/rc.d/utx                |  0
 {etc => sbin/init}/rc.d/var                |  0
 {etc => sbin/init}/rc.d/virecover          |  0
 {etc => sbin/init}/rc.d/watchdogd          |  0
 {etc => sbin/init}/rc.d/wpa_supplicant     |  0
 {etc => sbin/init}/rc.d/ypbind             |  0
 {etc => sbin/init}/rc.d/ypldap             |  0
 {etc => sbin/init}/rc.d/yppasswdd          |  0
 {etc => sbin/init}/rc.d/ypserv             |  0
 {etc => sbin/init}/rc.d/ypset              |  0
 {etc => sbin/init}/rc.d/ypupdated          |  0
 {etc => sbin/init}/rc.d/ypxfrd             |  0
 {etc => sbin/init}/rc.d/zfs                |  0
 {etc => sbin/init}/rc.d/zfsbe              |  0
 {etc => sbin/init}/rc.d/zfsd               |  0
 {etc => sbin/init}/rc.d/zvol               |  0
 170 files changed, 63 insertions(+), 59 deletions(-)
 rename {etc => sbin/init}/rc.d/DAEMON (100%)
 rename {etc => sbin/init}/rc.d/FILESYSTEMS (100%)
 rename {etc => sbin/init}/rc.d/LOGIN (100%)
 rename {etc => sbin/init}/rc.d/Makefile (77%)
 rename {etc => sbin/init}/rc.d/NETWORKING (100%)
 rename {etc => sbin/init}/rc.d/SERVERS (100%)
 rename {etc => sbin/init}/rc.d/abi (100%)
 rename {etc => sbin/init}/rc.d/accounting (100%)
 rename {etc => sbin/init}/rc.d/addswap (100%)
 rename {etc => sbin/init}/rc.d/adjkerntz (100%)
 rename {etc => sbin/init}/rc.d/amd (100%)
 rename {etc => sbin/init}/rc.d/apm (100%)
 rename {etc => sbin/init}/rc.d/apmd (100%)
 rename {etc => sbin/init}/rc.d/archdep (100%)
 rename {etc => sbin/init}/rc.d/auditd (100%)
 rename {etc => sbin/init}/rc.d/auditdistd (100%)
 rename {etc => sbin/init}/rc.d/automount (100%)
 rename {etc => sbin/init}/rc.d/automountd (100%)
 rename {etc => sbin/init}/rc.d/autounmountd (100%)
 rename {etc => sbin/init}/rc.d/bgfsck (100%)
 rename {etc => sbin/init}/rc.d/blacklistd (100%)
 rename {etc => sbin/init}/rc.d/bluetooth (100%)
 rename {etc => sbin/init}/rc.d/bootparams (100%)
 rename {etc => sbin/init}/rc.d/bridge (100%)
 rename {etc => sbin/init}/rc.d/bsnmpd (100%)
 rename {etc => sbin/init}/rc.d/bthidd (100%)
 rename {etc => sbin/init}/rc.d/ccd (100%)
 rename {etc => sbin/init}/rc.d/cfumass (100%)
 rename {etc => sbin/init}/rc.d/cleanvar (100%)
 rename {etc => sbin/init}/rc.d/cleartmp (100%)
 rename {etc => sbin/init}/rc.d/cron (100%)
 rename {etc => sbin/init}/rc.d/ctld (100%)
 rename {etc => sbin/init}/rc.d/ddb (100%)
 rename {etc => sbin/init}/rc.d/defaultroute (100%)
 rename {etc => sbin/init}/rc.d/devd (100%)
 rename {etc => sbin/init}/rc.d/devfs (100%)
 rename {etc => sbin/init}/rc.d/devmatch (100%)
 rename {etc => sbin/init}/rc.d/dhclient (100%)
 rename {etc => sbin/init}/rc.d/dmesg (100%)
 rename {etc => sbin/init}/rc.d/dumpon (100%)
 rename {etc => sbin/init}/rc.d/fsck (100%)
 rename {etc => sbin/init}/rc.d/ftp-proxy (100%)
 rename {etc => sbin/init}/rc.d/ftpd (100%)
 rename {etc => sbin/init}/rc.d/gbde (100%)
 rename {etc => sbin/init}/rc.d/geli (100%)
 rename {etc => sbin/init}/rc.d/geli2 (100%)
 rename {etc => sbin/init}/rc.d/gptboot (100%)
 rename {etc => sbin/init}/rc.d/growfs (100%)
 rename {etc => sbin/init}/rc.d/gssd (100%)
 rename {etc => sbin/init}/rc.d/hastd (100%)
 rename {etc => sbin/init}/rc.d/hcsecd (100%)
 rename {etc => sbin/init}/rc.d/hostapd (100%)
 rename {etc => sbin/init}/rc.d/hostid (100%)
 rename {etc => sbin/init}/rc.d/hostid_save (100%)
 rename {etc => sbin/init}/rc.d/hostname (100%)
 rename {etc => sbin/init}/rc.d/inetd (100%)
 rename {etc => sbin/init}/rc.d/iovctl (100%)
 rename {etc => sbin/init}/rc.d/ip6addrctl (100%)
 rename {etc => sbin/init}/rc.d/ipfilter (100%)
 rename {etc => sbin/init}/rc.d/ipfs (100%)
 rename {etc => sbin/init}/rc.d/ipfw (100%)
 rename {etc => sbin/init}/rc.d/ipfw_netflow (100%)
 rename {etc => sbin/init}/rc.d/ipmon (100%)
 rename {etc => sbin/init}/rc.d/ipnat (100%)
 rename {etc => sbin/init}/rc.d/ipropd_master (100%)
 rename {etc => sbin/init}/rc.d/ipropd_slave (100%)
 rename {etc => sbin/init}/rc.d/ipsec (100%)
 rename {etc => sbin/init}/rc.d/iscsictl (100%)
 rename {etc => sbin/init}/rc.d/iscsid (100%)
 rename {etc => sbin/init}/rc.d/jail (100%)
 rename {etc => sbin/init}/rc.d/kadmind (100%)
 rename {etc => sbin/init}/rc.d/kdc (100%)
 rename {etc => sbin/init}/rc.d/keyserv (100%)
 rename {etc => sbin/init}/rc.d/kfd (100%)
 rename {etc => sbin/init}/rc.d/kld (100%)
 rename {etc => sbin/init}/rc.d/kldxref (100%)
 rename {etc => sbin/init}/rc.d/kpasswdd (100%)
 rename {etc => sbin/init}/rc.d/ldconfig (100%)
 rename {etc => sbin/init}/rc.d/local (100%)
 rename {etc => sbin/init}/rc.d/local_unbound (100%)
 rename {etc => sbin/init}/rc.d/localpkg (100%)
 rename {etc => sbin/init}/rc.d/lockd (100%)
 rename {etc => sbin/init}/rc.d/lpd (100%)
 rename {etc => sbin/init}/rc.d/mdconfig (100%)
 rename {etc => sbin/init}/rc.d/mdconfig2 (100%)
 rename {etc => sbin/init}/rc.d/mixer (100%)
 rename {etc => sbin/init}/rc.d/motd (100%)
 rename {etc => sbin/init}/rc.d/mountcritlocal (100%)
 rename {etc => sbin/init}/rc.d/mountcritremote (100%)
 rename {etc => sbin/init}/rc.d/mountd (100%)
 rename {etc => sbin/init}/rc.d/mountlate (100%)
 rename {etc => sbin/init}/rc.d/moused (100%)
 rename {etc => sbin/init}/rc.d/msgs (100%)
 rename {etc => sbin/init}/rc.d/natd (100%)
 rename {etc => sbin/init}/rc.d/netif (100%)
 rename {etc => sbin/init}/rc.d/netoptions (100%)
 rename {etc => sbin/init}/rc.d/netwait (100%)
 rename {etc => sbin/init}/rc.d/newsyslog (100%)
 rename {etc => sbin/init}/rc.d/nfscbd (100%)
 rename {etc => sbin/init}/rc.d/nfsclient (100%)
 rename {etc => sbin/init}/rc.d/nfsd (100%)
 rename {etc => sbin/init}/rc.d/nfsuserd (100%)
 rename {etc => sbin/init}/rc.d/nisdomain (100%)
 rename {etc => sbin/init}/rc.d/nscd (100%)
 rename {etc => sbin/init}/rc.d/nsswitch (100%)
 rename {etc => sbin/init}/rc.d/ntpd (100%)
 rename {etc => sbin/init}/rc.d/ntpdate (100%)
 rename {etc => sbin/init}/rc.d/opensm (100%)
 rename {etc => sbin/init}/rc.d/othermta (100%)
 rename {etc => sbin/init}/rc.d/pf (100%)
 rename {etc => sbin/init}/rc.d/pflog (100%)
 rename {etc => sbin/init}/rc.d/pfsync (100%)
 rename {etc => sbin/init}/rc.d/power_profile (100%)
 rename {etc => sbin/init}/rc.d/powerd (100%)
 rename {etc => sbin/init}/rc.d/ppp (100%)
 rename {etc => sbin/init}/rc.d/pppoed (100%)
 rename {etc => sbin/init}/rc.d/pwcheck (100%)
 rename {etc => sbin/init}/rc.d/quota (100%)
 rename {etc => sbin/init}/rc.d/random (100%)
 rename {etc => sbin/init}/rc.d/rarpd (100%)
 rename {etc => sbin/init}/rc.d/rctl (100%)
 rename {etc => sbin/init}/rc.d/resolv (100%)
 rename {etc => sbin/init}/rc.d/rfcomm_pppd_server (100%)
 rename {etc => sbin/init}/rc.d/root (100%)
 rename {etc => sbin/init}/rc.d/route6d (100%)
 rename {etc => sbin/init}/rc.d/routed (100%)
 rename {etc => sbin/init}/rc.d/routing (100%)
 rename {etc => sbin/init}/rc.d/rpcbind (100%)
 rename {etc => sbin/init}/rc.d/rtadvd (100%)
 rename {etc => sbin/init}/rc.d/rtsold (100%)
 rename {etc => sbin/init}/rc.d/rwho (100%)
 rename {etc => sbin/init}/rc.d/savecore (100%)
 rename {etc => sbin/init}/rc.d/sdpd (100%)
 rename {etc => sbin/init}/rc.d/securelevel (100%)
 rename {etc => sbin/init}/rc.d/sendmail (100%)
 rename {etc => sbin/init}/rc.d/serial (100%)
 rename {etc => sbin/init}/rc.d/sppp (100%)
 rename {etc => sbin/init}/rc.d/sshd (100%)
 rename {etc => sbin/init}/rc.d/statd (100%)
 rename {etc => sbin/init}/rc.d/static_arp (100%)
 rename {etc => sbin/init}/rc.d/static_ndp (100%)
 rename {etc => sbin/init}/rc.d/stf (100%)
 rename {etc => sbin/init}/rc.d/swap (100%)
 rename {etc => sbin/init}/rc.d/swaplate (100%)
 rename {etc => sbin/init}/rc.d/syscons (100%)
 rename {etc => sbin/init}/rc.d/sysctl (100%)
 rename {etc => sbin/init}/rc.d/syslogd (100%)
 rename {etc => sbin/init}/rc.d/timed (100%)
 rename {etc => sbin/init}/rc.d/tmp (100%)
 rename {etc => sbin/init}/rc.d/ubthidhci (100%)
 rename {etc => sbin/init}/rc.d/ugidfw (100%)
 rename {etc => sbin/init}/rc.d/utx (100%)
 rename {etc => sbin/init}/rc.d/var (100%)
 rename {etc => sbin/init}/rc.d/virecover (100%)
 rename {etc => sbin/init}/rc.d/watchdogd (100%)
 rename {etc => sbin/init}/rc.d/wpa_supplicant (100%)
 rename {etc => sbin/init}/rc.d/ypbind (100%)
 rename {etc => sbin/init}/rc.d/ypldap (100%)
 rename {etc => sbin/init}/rc.d/yppasswdd (100%)
 rename {etc => sbin/init}/rc.d/ypserv (100%)
 rename {etc => sbin/init}/rc.d/ypset (100%)
 rename {etc => sbin/init}/rc.d/ypupdated (100%)
 rename {etc => sbin/init}/rc.d/ypxfrd (100%)
 rename {etc => sbin/init}/rc.d/zfs (100%)
 rename {etc => sbin/init}/rc.d/zfsbe (100%)
 rename {etc => sbin/init}/rc.d/zfsd (100%)
 rename {etc => sbin/init}/rc.d/zvol (100%)

diff --git a/etc/Makefile b/etc/Makefile
index 1cd648cbb863..7d3c79402254 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -31,19 +31,14 @@ BIN1=	crontab \
 	mac.conf \
 	motd \
 	netconfig \
-	network.subr \
 	networks \
 	newsyslog.conf \
 	nsswitch.conf \
 	phones \
 	profile \
 	protocols \
-	rc \
 	rc.bsdextended \
 	rc.firewall \
-	rc.initdiskless \
-	rc.shutdown \
-	rc.subr \
 	remote \
 	rpc \
 	services \
@@ -144,9 +139,6 @@ BIN1+= csh.cshrc csh.login csh.logout
 BIN1+= regdomain.xml
 .endif
 
-# -rwxr-xr-x root:wheel, for the new cron root:wheel
-BIN2=	netstart pccard_ether rc.suspend rc.resume
-
 .if ${MK_SENDMAIL} == "no"
 ETCMAIL=mailer.conf aliases
 .else
@@ -187,8 +179,6 @@ distribution:
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
 	    cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
-		${BIN2} ${DESTDIR}/etc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
 
@@ -235,7 +225,6 @@ distribution:
 .if ${MK_PKGBOOTSTRAP} != "no"
 	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
 .endif
-	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
 	${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile
index 4b3a4cea502f..7c25ac3af18d 100644
--- a/etc/defaults/Makefile
+++ b/etc/defaults/Makefile
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-FILES=	devfs.rules periodic.conf rc.conf
+FILES=	devfs.rules periodic.conf
 FILESDIR= /etc/defaults
 
 .if ${MK_BLUETOOTH} != "no"
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index f7e09501f93f..b00cb9c73684 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,6 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
+FILESGROUPS=	FILESETC FILESETCEXEC FILESETCDEFAULTS
+FILESETCDIR=	/etc
+FILESETC=	network.subr rc rc.initdiskless rc.subr rc.shutdown
+FILESETCMODE=	644
+FILESETCEXEC=	netstart pccard_ether rc.resume rc.suspend
+FILESETCEXECDIR=	/etc
+FILESETCEXECMODE=	755
+FILESETCDEFAULTSDIR=	/etc/defaults
+FILESETCDEFAULTS=	rc.conf
 PACKAGE=runtime
 PROG=	init
 SRCS=	init.c getmntopts.c
@@ -17,4 +26,6 @@ CFLAGS+=-I${MOUNT}
 
 NO_SHARED?=	YES
 
+SUBDIR+=	rc.d
+
 .include <bsd.prog.mk>
diff --git a/etc/rc.d/DAEMON b/sbin/init/rc.d/DAEMON
similarity index 100%
rename from etc/rc.d/DAEMON
rename to sbin/init/rc.d/DAEMON
diff --git a/etc/rc.d/FILESYSTEMS b/sbin/init/rc.d/FILESYSTEMS
similarity index 100%
rename from etc/rc.d/FILESYSTEMS
rename to sbin/init/rc.d/FILESYSTEMS
diff --git a/etc/rc.d/LOGIN b/sbin/init/rc.d/LOGIN
similarity index 100%
rename from etc/rc.d/LOGIN
rename to sbin/init/rc.d/LOGIN
diff --git a/etc/rc.d/Makefile b/sbin/init/rc.d/Makefile
similarity index 77%
rename from etc/rc.d/Makefile
rename to sbin/init/rc.d/Makefile
index 494bf8da19f9..85ceb5d21134 100644
--- a/etc/rc.d/Makefile
+++ b/sbin/init/rc.d/Makefile
@@ -2,10 +2,10 @@
 
 .include <src.opts.mk>
 
-BINDIR=		/etc/rc.d
-FILESGROUPS=	FILES
+CONFSDIR=	/etc/rc.d
+CONFSGROUPS=	CONFS
 
-FILES=	DAEMON \
+CONFS=	DAEMON \
 	FILESYSTEMS \
 	LOGIN \
 	NETWORKING \
@@ -75,7 +75,6 @@ FILES=	DAEMON \
 	netif \
 	netoptions \
 	netwait \
-	newsyslog \
 	nfsclient \
 	nfscbd \
 	nfsd \
@@ -113,8 +112,6 @@ FILES=	DAEMON \
 	stf \
 	swap \
 	swaplate \
-	sysctl \
-	syslogd \
 	tmp \
 	${_ubthidhci} \
 	ugidfw \
@@ -123,7 +120,7 @@ FILES=	DAEMON \
 	watchdogd
 
 .if ${MK_NIS} != "no"
-FILES+=	ypbind \
+CONFS+=	ypbind \
 	ypldap \
 	yppasswdd \
 	ypserv \
@@ -133,29 +130,29 @@ FILES+=	ypbind \
 .endif
 
 .if ${MK_ACCT} != "no"
-FILESGROUPS+=	ACCT
+CONFSGROUPS+=	ACCT
 ACCT+=		accounting
 ACCTPACKAGE=	acct
 .endif
 
 .if ${MK_ACPI} != "no"
-FILESGROUPS+=	ACPI
+CONFSGROUPS+=	ACPI
 ACPI=		power_profile
 ACPIPACKAGE=	acpi
 .endif
 
 .if ${MK_ACPI} != "no" || ${MK_APM} != "no"
-FILES+=		powerd
+CONFS+=		powerd
 .endif
 
 .if ${MK_AMD} != "no"
-FILESGROUPS+=	AMD
+CONFSGROUPS+=	AMD
 AMD+=		amd
 AMDPACKAGE=	amd
 .endif
 
 .if ${MK_APM} != "no"
-FILESGROUPS+=	APM
+CONFSGROUPS+=	APM
 APM+=		apm
 .if ${MACHINE} == "i386"
 APM+=		apmd
@@ -164,9 +161,9 @@ APMPACKAGE=	apm
 .endif
 
 .if ${MK_AUTOFS} != "no"
-FILES+=		automount
-FILES+=		automountd
-FILES+=		autounmountd
+CONFS+=		automount
+CONFS+=		automountd
+CONFS+=		autounmountd
 .endif
 
 .if ${MK_BLACKLIST} != "no"
@@ -177,77 +174,81 @@ _blacklistd+=	blacklistd
 _bluetooth=	bluetooth
 _bthidd=	bthidd
 _hcsecd=	hcsecd
-FILES+=		rfcomm_pppd_server
-FILES+=		sdpd
+CONFS+=		rfcomm_pppd_server
+CONFS+=		sdpd
 _ubthidhci=	ubthidhci
 .endif
 
 .if ${MK_BOOTPARAMD} != "no"
-FILES+=		bootparams
+CONFS+=		bootparams
 .endif
 
 .if ${MK_BSNMP} != "no"
-FILESGROUPS+=	BSNMP
+CONFSGROUPS+=	BSNMP
 BSNMP+=		bsnmpd
 BSNMPPACKAGE=	bsnmp
 .endif
 
 .if ${MK_CCD} != "no"
-FILES+=		ccd
+CONFS+=		ccd
 .endif
 
 .if ${MK_FTP} != "no"
-FILES+=		ftpd
+CONFS+=		ftpd
 .endif
 
 .if ${MK_HAST} != "no"
-FILESGROUPS+=	HAST
+CONFSGROUPS+=	HAST
 HAST=		hastd
 HASTPACKAGE=	hast
 .endif
 
 .if ${MK_INETD} != "no"
-FILES+=		inetd
+CONFS+=		inetd
 .endif
 
 .if ${MK_IPFW} != "no"
-FILES+=		ipfw
+CONFS+=		ipfw
 .if ${MK_NETGRAPH} != "no"
-FILES+=		ipfw_netflow
+CONFS+=		ipfw_netflow
 .endif
 .endif
 
 .if ${MK_ISCSI} != "no"
-FILES+=		iscsictl
-FILES+=		iscsid
+CONFS+=		iscsictl
+CONFS+=		iscsid
 .endif
 
 .if ${MK_JAIL} != "no"
-FILESGROUPS+=	JAIL
+CONFSGROUPS+=	JAIL
 JAIL+=		jail
 JAILPACKAGE=	jail
 .endif
 
 .if ${MK_LEGACY_CONSOLE} != "no"
-FILES+=		moused
-FILES+=		syscons
+CONFS+=		moused
+CONFS+=		syscons
 .endif
 
 .if ${MK_LPR} != "no"
-FILES+=		lpd
+CONFS+=		lpd
 .endif
 
 .if ${MK_KERBEROS} != "no"
-FILES+=		ipropd_master
-FILES+=		ipropd_slave
+CONFS+=		ipropd_master
+CONFS+=		ipropd_slave
 _kadmind=	kadmind
 _kdc=		kdc
 _kfd=		kfd
 _kpasswdd=	kpasswdd
+
+DIRS+=	VAR_HEMIDAL
+VAR_HEMIDAL=	/var/heimdal
+VAR_HEMIDAL_MODE=	700
 .endif
 
 .if ${MK_MAIL} != "no"
-FILES+=		othermta
+CONFS+=		othermta
 .endif
 
 .if ${MK_NS_CACHING} != "no"
@@ -255,7 +256,7 @@ _nscd=		nscd
 .endif
 
 .if ${MK_NTP} != "no"
-FILES+=		ntpd
+CONFS+=		ntpd
 .endif
 
 .if ${MK_OFED} != "no"
@@ -263,35 +264,35 @@ _opensm=	opensm
 .endif
 
 .if ${MK_OPENSSL} != "no"
-FILES+=		keyserv
+CONFS+=		keyserv
 .endif
 
 .if ${MK_OPENSSH} != "no"
-FILESGROUPS+=	SSH
+CONFSGROUPS+=	SSH
 SSH=		sshd
 SSHPACKAGE=	ssh
 .endif
 
 .if ${MK_PF} != "no"
-FILES+=		ftp-proxy
+CONFS+=		ftp-proxy
 .endif
 
 .if ${MK_ROUTED} != "no"
-FILES+=		routed
+CONFS+=		routed
 .endif
 
 .if ${MK_SENDMAIL} != "no"
-FILESGROUPS+=	SMRCD
+CONFSGROUPS+=	SMRCD
 SMRCD=		sendmail
 SMRCDPACKAGE=	sendmail
 .endif
 
 .if ${MK_TIMED} != "no"
-FILES+=		timed
+CONFS+=		timed
 .endif
 
 .if ${MK_UNBOUND} != "no"
-FILESGROUPS+=	UNBOUND
+CONFSGROUPS+=	UNBOUND
 UNBOUND+=	local_unbound
 UNBOUNDPACKAGE=	unbound
 .endif
@@ -301,26 +302,29 @@ _utx=		utx
 .endif
 
 .if ${MK_VI} != "no"
-FILESGROUPS+=	VI
+CONFSGROUPS+=	VI
 VI+=		virecover
 VIPACKAGE=	vi
 .endif
 
 .if ${MK_WIRELESS} != "no"
-FILES+=		hostapd
-FILES+=		wpa_supplicant
+CONFS+=		hostapd
+CONFS+=		wpa_supplicant
 .endif
 
 .if ${MK_ZFS} != "no"
-FILESGROUPS+=	ZFS
+CONFSGROUPS+=	ZFS
 ZFS+=		zfs
 ZFS+=		zfsbe
 ZFS+=		zfsd
 ZFS+=		zvol
 ZFSPACKAGE=	zfs
+DIRS+=	ETC_ZFS
+ETC_ZFS=	/etc/zfs
+ETC_ZFSPACKAGE=	zfs
 .endif
 
-.for fg in ${FILESGROUPS}
+.for fg in ${CONFSGROUPS}
 ${fg}MODE?=	${BINMODE}
 .endfor
 
diff --git a/etc/rc.d/NETWORKING b/sbin/init/rc.d/NETWORKING
similarity index 100%
rename from etc/rc.d/NETWORKING
rename to sbin/init/rc.d/NETWORKING
diff --git a/etc/rc.d/SERVERS b/sbin/init/rc.d/SERVERS
similarity index 100%
rename from etc/rc.d/SERVERS
rename to sbin/init/rc.d/SERVERS
diff --git a/etc/rc.d/abi b/sbin/init/rc.d/abi
similarity index 100%
rename from etc/rc.d/abi
rename to sbin/init/rc.d/abi
diff --git a/etc/rc.d/accounting b/sbin/init/rc.d/accounting
similarity index 100%
rename from etc/rc.d/accounting
rename to sbin/init/rc.d/accounting
diff --git a/etc/rc.d/addswap b/sbin/init/rc.d/addswap
similarity index 100%
rename from etc/rc.d/addswap
rename to sbin/init/rc.d/addswap
diff --git a/etc/rc.d/adjkerntz b/sbin/init/rc.d/adjkerntz
similarity index 100%
rename from etc/rc.d/adjkerntz
rename to sbin/init/rc.d/adjkerntz
diff --git a/etc/rc.d/amd b/sbin/init/rc.d/amd
similarity index 100%
rename from etc/rc.d/amd
rename to sbin/init/rc.d/amd
diff --git a/etc/rc.d/apm b/sbin/init/rc.d/apm
similarity index 100%
rename from etc/rc.d/apm
rename to sbin/init/rc.d/apm
diff --git a/etc/rc.d/apmd b/sbin/init/rc.d/apmd
similarity index 100%
rename from etc/rc.d/apmd
rename to sbin/init/rc.d/apmd
diff --git a/etc/rc.d/archdep b/sbin/init/rc.d/archdep
similarity index 100%
rename from etc/rc.d/archdep
rename to sbin/init/rc.d/archdep
diff --git a/etc/rc.d/auditd b/sbin/init/rc.d/auditd
similarity index 100%
rename from etc/rc.d/auditd
rename to sbin/init/rc.d/auditd
diff --git a/etc/rc.d/auditdistd b/sbin/init/rc.d/auditdistd
similarity index 100%
rename from etc/rc.d/auditdistd
rename to sbin/init/rc.d/auditdistd
diff --git a/etc/rc.d/automount b/sbin/init/rc.d/automount
similarity index 100%
rename from etc/rc.d/automount
rename to sbin/init/rc.d/automount
diff --git a/etc/rc.d/automountd b/sbin/init/rc.d/automountd
similarity index 100%
rename from etc/rc.d/automountd
rename to sbin/init/rc.d/automountd
diff --git a/etc/rc.d/autounmountd b/sbin/init/rc.d/autounmountd
similarity index 100%
rename from etc/rc.d/autounmountd
rename to sbin/init/rc.d/autounmountd
diff --git a/etc/rc.d/bgfsck b/sbin/init/rc.d/bgfsck
similarity index 100%
rename from etc/rc.d/bgfsck
rename to sbin/init/rc.d/bgfsck
diff --git a/etc/rc.d/blacklistd b/sbin/init/rc.d/blacklistd
similarity index 100%
rename from etc/rc.d/blacklistd
rename to sbin/init/rc.d/blacklistd
diff --git a/etc/rc.d/bluetooth b/sbin/init/rc.d/bluetooth
similarity index 100%
rename from etc/rc.d/bluetooth
rename to sbin/init/rc.d/bluetooth
diff --git a/etc/rc.d/bootparams b/sbin/init/rc.d/bootparams
similarity index 100%
rename from etc/rc.d/bootparams
rename to sbin/init/rc.d/bootparams
diff --git a/etc/rc.d/bridge b/sbin/init/rc.d/bridge
similarity index 100%
rename from etc/rc.d/bridge
rename to sbin/init/rc.d/bridge
diff --git a/etc/rc.d/bsnmpd b/sbin/init/rc.d/bsnmpd
similarity index 100%
rename from etc/rc.d/bsnmpd
rename to sbin/init/rc.d/bsnmpd
diff --git a/etc/rc.d/bthidd b/sbin/init/rc.d/bthidd
similarity index 100%
rename from etc/rc.d/bthidd
rename to sbin/init/rc.d/bthidd
diff --git a/etc/rc.d/ccd b/sbin/init/rc.d/ccd
similarity index 100%
rename from etc/rc.d/ccd
rename to sbin/init/rc.d/ccd
diff --git a/etc/rc.d/cfumass b/sbin/init/rc.d/cfumass
similarity index 100%
rename from etc/rc.d/cfumass
rename to sbin/init/rc.d/cfumass
diff --git a/etc/rc.d/cleanvar b/sbin/init/rc.d/cleanvar
similarity index 100%
rename from etc/rc.d/cleanvar
rename to sbin/init/rc.d/cleanvar
diff --git a/etc/rc.d/cleartmp b/sbin/init/rc.d/cleartmp
similarity index 100%
rename from etc/rc.d/cleartmp
rename to sbin/init/rc.d/cleartmp
diff --git a/etc/rc.d/cron b/sbin/init/rc.d/cron
similarity index 100%
rename from etc/rc.d/cron
rename to sbin/init/rc.d/cron
diff --git a/etc/rc.d/ctld b/sbin/init/rc.d/ctld
similarity index 100%
rename from etc/rc.d/ctld
rename to sbin/init/rc.d/ctld
diff --git a/etc/rc.d/ddb b/sbin/init/rc.d/ddb
similarity index 100%
rename from etc/rc.d/ddb
rename to sbin/init/rc.d/ddb
diff --git a/etc/rc.d/defaultroute b/sbin/init/rc.d/defaultroute
similarity index 100%
rename from etc/rc.d/defaultroute
rename to sbin/init/rc.d/defaultroute
diff --git a/etc/rc.d/devd b/sbin/init/rc.d/devd
similarity index 100%
rename from etc/rc.d/devd
rename to sbin/init/rc.d/devd
diff --git a/etc/rc.d/devfs b/sbin/init/rc.d/devfs
similarity index 100%
rename from etc/rc.d/devfs
rename to sbin/init/rc.d/devfs
diff --git a/etc/rc.d/devmatch b/sbin/init/rc.d/devmatch
similarity index 100%
rename from etc/rc.d/devmatch
rename to sbin/init/rc.d/devmatch
diff --git a/etc/rc.d/dhclient b/sbin/init/rc.d/dhclient
similarity index 100%
rename from etc/rc.d/dhclient
rename to sbin/init/rc.d/dhclient
diff --git a/etc/rc.d/dmesg b/sbin/init/rc.d/dmesg
similarity index 100%
rename from etc/rc.d/dmesg
rename to sbin/init/rc.d/dmesg
diff --git a/etc/rc.d/dumpon b/sbin/init/rc.d/dumpon
similarity index 100%
rename from etc/rc.d/dumpon
rename to sbin/init/rc.d/dumpon
diff --git a/etc/rc.d/fsck b/sbin/init/rc.d/fsck
similarity index 100%
rename from etc/rc.d/fsck
rename to sbin/init/rc.d/fsck
diff --git a/etc/rc.d/ftp-proxy b/sbin/init/rc.d/ftp-proxy
similarity index 100%
rename from etc/rc.d/ftp-proxy
rename to sbin/init/rc.d/ftp-proxy
diff --git a/etc/rc.d/ftpd b/sbin/init/rc.d/ftpd
similarity index 100%
rename from etc/rc.d/ftpd
rename to sbin/init/rc.d/ftpd
diff --git a/etc/rc.d/gbde b/sbin/init/rc.d/gbde
similarity index 100%
rename from etc/rc.d/gbde
rename to sbin/init/rc.d/gbde
diff --git a/etc/rc.d/geli b/sbin/init/rc.d/geli
similarity index 100%
rename from etc/rc.d/geli
rename to sbin/init/rc.d/geli
diff --git a/etc/rc.d/geli2 b/sbin/init/rc.d/geli2
similarity index 100%
rename from etc/rc.d/geli2
rename to sbin/init/rc.d/geli2
diff --git a/etc/rc.d/gptboot b/sbin/init/rc.d/gptboot
similarity index 100%
rename from etc/rc.d/gptboot
rename to sbin/init/rc.d/gptboot
diff --git a/etc/rc.d/growfs b/sbin/init/rc.d/growfs
similarity index 100%
rename from etc/rc.d/growfs
rename to sbin/init/rc.d/growfs
diff --git a/etc/rc.d/gssd b/sbin/init/rc.d/gssd
similarity index 100%
rename from etc/rc.d/gssd
rename to sbin/init/rc.d/gssd
diff --git a/etc/rc.d/hastd b/sbin/init/rc.d/hastd
similarity index 100%
rename from etc/rc.d/hastd
rename to sbin/init/rc.d/hastd
diff --git a/etc/rc.d/hcsecd b/sbin/init/rc.d/hcsecd
similarity index 100%
rename from etc/rc.d/hcsecd
rename to sbin/init/rc.d/hcsecd
diff --git a/etc/rc.d/hostapd b/sbin/init/rc.d/hostapd
similarity index 100%
rename from etc/rc.d/hostapd
rename to sbin/init/rc.d/hostapd
diff --git a/etc/rc.d/hostid b/sbin/init/rc.d/hostid
similarity index 100%
rename from etc/rc.d/hostid
rename to sbin/init/rc.d/hostid
diff --git a/etc/rc.d/hostid_save b/sbin/init/rc.d/hostid_save
similarity index 100%
rename from etc/rc.d/hostid_save
rename to sbin/init/rc.d/hostid_save
diff --git a/etc/rc.d/hostname b/sbin/init/rc.d/hostname
similarity index 100%
rename from etc/rc.d/hostname
rename to sbin/init/rc.d/hostname
diff --git a/etc/rc.d/inetd b/sbin/init/rc.d/inetd
similarity index 100%
rename from etc/rc.d/inetd
rename to sbin/init/rc.d/inetd
diff --git a/etc/rc.d/iovctl b/sbin/init/rc.d/iovctl
similarity index 100%
rename from etc/rc.d/iovctl
rename to sbin/init/rc.d/iovctl
diff --git a/etc/rc.d/ip6addrctl b/sbin/init/rc.d/ip6addrctl
similarity index 100%
rename from etc/rc.d/ip6addrctl
rename to sbin/init/rc.d/ip6addrctl
diff --git a/etc/rc.d/ipfilter b/sbin/init/rc.d/ipfilter
similarity index 100%
rename from etc/rc.d/ipfilter
rename to sbin/init/rc.d/ipfilter
diff --git a/etc/rc.d/ipfs b/sbin/init/rc.d/ipfs
similarity index 100%
rename from etc/rc.d/ipfs
rename to sbin/init/rc.d/ipfs
diff --git a/etc/rc.d/ipfw b/sbin/init/rc.d/ipfw
similarity index 100%
rename from etc/rc.d/ipfw
rename to sbin/init/rc.d/ipfw
diff --git a/etc/rc.d/ipfw_netflow b/sbin/init/rc.d/ipfw_netflow
similarity index 100%
rename from etc/rc.d/ipfw_netflow
rename to sbin/init/rc.d/ipfw_netflow
diff --git a/etc/rc.d/ipmon b/sbin/init/rc.d/ipmon
similarity index 100%
rename from etc/rc.d/ipmon
rename to sbin/init/rc.d/ipmon
diff --git a/etc/rc.d/ipnat b/sbin/init/rc.d/ipnat
similarity index 100%
rename from etc/rc.d/ipnat
rename to sbin/init/rc.d/ipnat
diff --git a/etc/rc.d/ipropd_master b/sbin/init/rc.d/ipropd_master
similarity index 100%
rename from etc/rc.d/ipropd_master
rename to sbin/init/rc.d/ipropd_master
diff --git a/etc/rc.d/ipropd_slave b/sbin/init/rc.d/ipropd_slave
similarity index 100%
rename from etc/rc.d/ipropd_slave
rename to sbin/init/rc.d/ipropd_slave
diff --git a/etc/rc.d/ipsec b/sbin/init/rc.d/ipsec
similarity index 100%
rename from etc/rc.d/ipsec
rename to sbin/init/rc.d/ipsec
diff --git a/etc/rc.d/iscsictl b/sbin/init/rc.d/iscsictl
similarity index 100%
rename from etc/rc.d/iscsictl
rename to sbin/init/rc.d/iscsictl
diff --git a/etc/rc.d/iscsid b/sbin/init/rc.d/iscsid
similarity index 100%
rename from etc/rc.d/iscsid
rename to sbin/init/rc.d/iscsid
diff --git a/etc/rc.d/jail b/sbin/init/rc.d/jail
similarity index 100%
rename from etc/rc.d/jail
rename to sbin/init/rc.d/jail
diff --git a/etc/rc.d/kadmind b/sbin/init/rc.d/kadmind
similarity index 100%
rename from etc/rc.d/kadmind
rename to sbin/init/rc.d/kadmind
diff --git a/etc/rc.d/kdc b/sbin/init/rc.d/kdc
similarity index 100%
rename from etc/rc.d/kdc
rename to sbin/init/rc.d/kdc
diff --git a/etc/rc.d/keyserv b/sbin/init/rc.d/keyserv
similarity index 100%
rename from etc/rc.d/keyserv
rename to sbin/init/rc.d/keyserv
diff --git a/etc/rc.d/kfd b/sbin/init/rc.d/kfd
similarity index 100%
rename from etc/rc.d/kfd
rename to sbin/init/rc.d/kfd
diff --git a/etc/rc.d/kld b/sbin/init/rc.d/kld
similarity index 100%
rename from etc/rc.d/kld
rename to sbin/init/rc.d/kld
diff --git a/etc/rc.d/kldxref b/sbin/init/rc.d/kldxref
similarity index 100%
rename from etc/rc.d/kldxref
rename to sbin/init/rc.d/kldxref
diff --git a/etc/rc.d/kpasswdd b/sbin/init/rc.d/kpasswdd
similarity index 100%
rename from etc/rc.d/kpasswdd
rename to sbin/init/rc.d/kpasswdd
diff --git a/etc/rc.d/ldconfig b/sbin/init/rc.d/ldconfig
similarity index 100%
rename from etc/rc.d/ldconfig
rename to sbin/init/rc.d/ldconfig
diff --git a/etc/rc.d/local b/sbin/init/rc.d/local
similarity index 100%
rename from etc/rc.d/local
rename to sbin/init/rc.d/local
diff --git a/etc/rc.d/local_unbound b/sbin/init/rc.d/local_unbound
similarity index 100%
rename from etc/rc.d/local_unbound
rename to sbin/init/rc.d/local_unbound
diff --git a/etc/rc.d/localpkg b/sbin/init/rc.d/localpkg
similarity index 100%
rename from etc/rc.d/localpkg
rename to sbin/init/rc.d/localpkg
diff --git a/etc/rc.d/lockd b/sbin/init/rc.d/lockd
similarity index 100%
rename from etc/rc.d/lockd
rename to sbin/init/rc.d/lockd
diff --git a/etc/rc.d/lpd b/sbin/init/rc.d/lpd
similarity index 100%
rename from etc/rc.d/lpd
rename to sbin/init/rc.d/lpd
diff --git a/etc/rc.d/mdconfig b/sbin/init/rc.d/mdconfig
similarity index 100%
rename from etc/rc.d/mdconfig
rename to sbin/init/rc.d/mdconfig
diff --git a/etc/rc.d/mdconfig2 b/sbin/init/rc.d/mdconfig2
similarity index 100%
rename from etc/rc.d/mdconfig2
rename to sbin/init/rc.d/mdconfig2
diff --git a/etc/rc.d/mixer b/sbin/init/rc.d/mixer
similarity index 100%
rename from etc/rc.d/mixer
rename to sbin/init/rc.d/mixer
diff --git a/etc/rc.d/motd b/sbin/init/rc.d/motd
similarity index 100%
rename from etc/rc.d/motd
rename to sbin/init/rc.d/motd
diff --git a/etc/rc.d/mountcritlocal b/sbin/init/rc.d/mountcritlocal
similarity index 100%
rename from etc/rc.d/mountcritlocal
rename to sbin/init/rc.d/mountcritlocal
diff --git a/etc/rc.d/mountcritremote b/sbin/init/rc.d/mountcritremote
similarity index 100%
rename from etc/rc.d/mountcritremote
rename to sbin/init/rc.d/mountcritremote
diff --git a/etc/rc.d/mountd b/sbin/init/rc.d/mountd
similarity index 100%
rename from etc/rc.d/mountd
rename to sbin/init/rc.d/mountd
diff --git a/etc/rc.d/mountlate b/sbin/init/rc.d/mountlate
similarity index 100%
rename from etc/rc.d/mountlate
rename to sbin/init/rc.d/mountlate
diff --git a/etc/rc.d/moused b/sbin/init/rc.d/moused
similarity index 100%
rename from etc/rc.d/moused
rename to sbin/init/rc.d/moused
diff --git a/etc/rc.d/msgs b/sbin/init/rc.d/msgs
similarity index 100%
rename from etc/rc.d/msgs
rename to sbin/init/rc.d/msgs
diff --git a/etc/rc.d/natd b/sbin/init/rc.d/natd
similarity index 100%
rename from etc/rc.d/natd
rename to sbin/init/rc.d/natd
diff --git a/etc/rc.d/netif b/sbin/init/rc.d/netif
similarity index 100%
rename from etc/rc.d/netif
rename to sbin/init/rc.d/netif
diff --git a/etc/rc.d/netoptions b/sbin/init/rc.d/netoptions
similarity index 100%
rename from etc/rc.d/netoptions
rename to sbin/init/rc.d/netoptions
diff --git a/etc/rc.d/netwait b/sbin/init/rc.d/netwait
similarity index 100%
rename from etc/rc.d/netwait
rename to sbin/init/rc.d/netwait
diff --git a/etc/rc.d/newsyslog b/sbin/init/rc.d/newsyslog
similarity index 100%
rename from etc/rc.d/newsyslog
rename to sbin/init/rc.d/newsyslog
diff --git a/etc/rc.d/nfscbd b/sbin/init/rc.d/nfscbd
similarity index 100%
rename from etc/rc.d/nfscbd
rename to sbin/init/rc.d/nfscbd
diff --git a/etc/rc.d/nfsclient b/sbin/init/rc.d/nfsclient
similarity index 100%
rename from etc/rc.d/nfsclient
rename to sbin/init/rc.d/nfsclient
diff --git a/etc/rc.d/nfsd b/sbin/init/rc.d/nfsd
similarity index 100%
rename from etc/rc.d/nfsd
rename to sbin/init/rc.d/nfsd
diff --git a/etc/rc.d/nfsuserd b/sbin/init/rc.d/nfsuserd
similarity index 100%
rename from etc/rc.d/nfsuserd
rename to sbin/init/rc.d/nfsuserd
diff --git a/etc/rc.d/nisdomain b/sbin/init/rc.d/nisdomain
similarity index 100%
rename from etc/rc.d/nisdomain
rename to sbin/init/rc.d/nisdomain
diff --git a/etc/rc.d/nscd b/sbin/init/rc.d/nscd
similarity index 100%
rename from etc/rc.d/nscd
rename to sbin/init/rc.d/nscd
diff --git a/etc/rc.d/nsswitch b/sbin/init/rc.d/nsswitch
similarity index 100%
rename from etc/rc.d/nsswitch
rename to sbin/init/rc.d/nsswitch
diff --git a/etc/rc.d/ntpd b/sbin/init/rc.d/ntpd
similarity index 100%
rename from etc/rc.d/ntpd
rename to sbin/init/rc.d/ntpd
diff --git a/etc/rc.d/ntpdate b/sbin/init/rc.d/ntpdate
similarity index 100%
rename from etc/rc.d/ntpdate
rename to sbin/init/rc.d/ntpdate
diff --git a/etc/rc.d/opensm b/sbin/init/rc.d/opensm
similarity index 100%
rename from etc/rc.d/opensm
rename to sbin/init/rc.d/opensm
diff --git a/etc/rc.d/othermta b/sbin/init/rc.d/othermta
similarity index 100%
rename from etc/rc.d/othermta
rename to sbin/init/rc.d/othermta
diff --git a/etc/rc.d/pf b/sbin/init/rc.d/pf
similarity index 100%
rename from etc/rc.d/pf
rename to sbin/init/rc.d/pf
diff --git a/etc/rc.d/pflog b/sbin/init/rc.d/pflog
similarity index 100%
rename from etc/rc.d/pflog
rename to sbin/init/rc.d/pflog
diff --git a/etc/rc.d/pfsync b/sbin/init/rc.d/pfsync
similarity index 100%
rename from etc/rc.d/pfsync
rename to sbin/init/rc.d/pfsync
diff --git a/etc/rc.d/power_profile b/sbin/init/rc.d/power_profile
similarity index 100%
rename from etc/rc.d/power_profile
rename to sbin/init/rc.d/power_profile
diff --git a/etc/rc.d/powerd b/sbin/init/rc.d/powerd
similarity index 100%
rename from etc/rc.d/powerd
rename to sbin/init/rc.d/powerd
diff --git a/etc/rc.d/ppp b/sbin/init/rc.d/ppp
similarity index 100%
rename from etc/rc.d/ppp
rename to sbin/init/rc.d/ppp
diff --git a/etc/rc.d/pppoed b/sbin/init/rc.d/pppoed
similarity index 100%
rename from etc/rc.d/pppoed
rename to sbin/init/rc.d/pppoed
diff --git a/etc/rc.d/pwcheck b/sbin/init/rc.d/pwcheck
similarity index 100%
rename from etc/rc.d/pwcheck
rename to sbin/init/rc.d/pwcheck
diff --git a/etc/rc.d/quota b/sbin/init/rc.d/quota
similarity index 100%
rename from etc/rc.d/quota
rename to sbin/init/rc.d/quota
diff --git a/etc/rc.d/random b/sbin/init/rc.d/random
similarity index 100%
rename from etc/rc.d/random
rename to sbin/init/rc.d/random
diff --git a/etc/rc.d/rarpd b/sbin/init/rc.d/rarpd
similarity index 100%
rename from etc/rc.d/rarpd
rename to sbin/init/rc.d/rarpd
diff --git a/etc/rc.d/rctl b/sbin/init/rc.d/rctl
similarity index 100%
rename from etc/rc.d/rctl
rename to sbin/init/rc.d/rctl
diff --git a/etc/rc.d/resolv b/sbin/init/rc.d/resolv
similarity index 100%
rename from etc/rc.d/resolv
rename to sbin/init/rc.d/resolv
diff --git a/etc/rc.d/rfcomm_pppd_server b/sbin/init/rc.d/rfcomm_pppd_server
similarity index 100%
rename from etc/rc.d/rfcomm_pppd_server
rename to sbin/init/rc.d/rfcomm_pppd_server
diff --git a/etc/rc.d/root b/sbin/init/rc.d/root
similarity index 100%
rename from etc/rc.d/root
rename to sbin/init/rc.d/root
diff --git a/etc/rc.d/route6d b/sbin/init/rc.d/route6d
similarity index 100%
rename from etc/rc.d/route6d
rename to sbin/init/rc.d/route6d
diff --git a/etc/rc.d/routed b/sbin/init/rc.d/routed
similarity index 100%
rename from etc/rc.d/routed
rename to sbin/init/rc.d/routed
diff --git a/etc/rc.d/routing b/sbin/init/rc.d/routing
similarity index 100%
rename from etc/rc.d/routing
rename to sbin/init/rc.d/routing
diff --git a/etc/rc.d/rpcbind b/sbin/init/rc.d/rpcbind
similarity index 100%
rename from etc/rc.d/rpcbind
rename to sbin/init/rc.d/rpcbind
diff --git a/etc/rc.d/rtadvd b/sbin/init/rc.d/rtadvd
similarity index 100%
rename from etc/rc.d/rtadvd
rename to sbin/init/rc.d/rtadvd
diff --git a/etc/rc.d/rtsold b/sbin/init/rc.d/rtsold
similarity index 100%
rename from etc/rc.d/rtsold
rename to sbin/init/rc.d/rtsold
diff --git a/etc/rc.d/rwho b/sbin/init/rc.d/rwho
similarity index 100%
rename from etc/rc.d/rwho
rename to sbin/init/rc.d/rwho
diff --git a/etc/rc.d/savecore b/sbin/init/rc.d/savecore
similarity index 100%
rename from etc/rc.d/savecore
rename to sbin/init/rc.d/savecore
diff --git a/etc/rc.d/sdpd b/sbin/init/rc.d/sdpd
similarity index 100%
rename from etc/rc.d/sdpd
rename to sbin/init/rc.d/sdpd
diff --git a/etc/rc.d/securelevel b/sbin/init/rc.d/securelevel
similarity index 100%
rename from etc/rc.d/securelevel
rename to sbin/init/rc.d/securelevel
diff --git a/etc/rc.d/sendmail b/sbin/init/rc.d/sendmail
similarity index 100%
rename from etc/rc.d/sendmail
rename to sbin/init/rc.d/sendmail
diff --git a/etc/rc.d/serial b/sbin/init/rc.d/serial
similarity index 100%
rename from etc/rc.d/serial
rename to sbin/init/rc.d/serial
diff --git a/etc/rc.d/sppp b/sbin/init/rc.d/sppp
similarity index 100%
rename from etc/rc.d/sppp
rename to sbin/init/rc.d/sppp
diff --git a/etc/rc.d/sshd b/sbin/init/rc.d/sshd
similarity index 100%
rename from etc/rc.d/sshd
rename to sbin/init/rc.d/sshd
diff --git a/etc/rc.d/statd b/sbin/init/rc.d/statd
similarity index 100%
rename from etc/rc.d/statd
rename to sbin/init/rc.d/statd
diff --git a/etc/rc.d/static_arp b/sbin/init/rc.d/static_arp
similarity index 100%
rename from etc/rc.d/static_arp
rename to sbin/init/rc.d/static_arp
diff --git a/etc/rc.d/static_ndp b/sbin/init/rc.d/static_ndp
similarity index 100%
rename from etc/rc.d/static_ndp
rename to sbin/init/rc.d/static_ndp
diff --git a/etc/rc.d/stf b/sbin/init/rc.d/stf
similarity index 100%
rename from etc/rc.d/stf
rename to sbin/init/rc.d/stf
diff --git a/etc/rc.d/swap b/sbin/init/rc.d/swap
similarity index 100%
rename from etc/rc.d/swap
rename to sbin/init/rc.d/swap
diff --git a/etc/rc.d/swaplate b/sbin/init/rc.d/swaplate
similarity index 100%
rename from etc/rc.d/swaplate
rename to sbin/init/rc.d/swaplate
diff --git a/etc/rc.d/syscons b/sbin/init/rc.d/syscons
similarity index 100%
rename from etc/rc.d/syscons
rename to sbin/init/rc.d/syscons
diff --git a/etc/rc.d/sysctl b/sbin/init/rc.d/sysctl
similarity index 100%
rename from etc/rc.d/sysctl
rename to sbin/init/rc.d/sysctl
diff --git a/etc/rc.d/syslogd b/sbin/init/rc.d/syslogd
similarity index 100%
rename from etc/rc.d/syslogd
rename to sbin/init/rc.d/syslogd
diff --git a/etc/rc.d/timed b/sbin/init/rc.d/timed
similarity index 100%
rename from etc/rc.d/timed
rename to sbin/init/rc.d/timed
diff --git a/etc/rc.d/tmp b/sbin/init/rc.d/tmp
similarity index 100%
rename from etc/rc.d/tmp
rename to sbin/init/rc.d/tmp
diff --git a/etc/rc.d/ubthidhci b/sbin/init/rc.d/ubthidhci
similarity index 100%
rename from etc/rc.d/ubthidhci
rename to sbin/init/rc.d/ubthidhci
diff --git a/etc/rc.d/ugidfw b/sbin/init/rc.d/ugidfw
similarity index 100%
rename from etc/rc.d/ugidfw
rename to sbin/init/rc.d/ugidfw
diff --git a/etc/rc.d/utx b/sbin/init/rc.d/utx
similarity index 100%
rename from etc/rc.d/utx
rename to sbin/init/rc.d/utx
diff --git a/etc/rc.d/var b/sbin/init/rc.d/var
similarity index 100%
rename from etc/rc.d/var
rename to sbin/init/rc.d/var
diff --git a/etc/rc.d/virecover b/sbin/init/rc.d/virecover
similarity index 100%
rename from etc/rc.d/virecover
rename to sbin/init/rc.d/virecover
diff --git a/etc/rc.d/watchdogd b/sbin/init/rc.d/watchdogd
similarity index 100%
rename from etc/rc.d/watchdogd
rename to sbin/init/rc.d/watchdogd
diff --git a/etc/rc.d/wpa_supplicant b/sbin/init/rc.d/wpa_supplicant
similarity index 100%
rename from etc/rc.d/wpa_supplicant
rename to sbin/init/rc.d/wpa_supplicant
diff --git a/etc/rc.d/ypbind b/sbin/init/rc.d/ypbind
similarity index 100%
rename from etc/rc.d/ypbind
rename to sbin/init/rc.d/ypbind
diff --git a/etc/rc.d/ypldap b/sbin/init/rc.d/ypldap
similarity index 100%
rename from etc/rc.d/ypldap
rename to sbin/init/rc.d/ypldap
diff --git a/etc/rc.d/yppasswdd b/sbin/init/rc.d/yppasswdd
similarity index 100%
rename from etc/rc.d/yppasswdd
rename to sbin/init/rc.d/yppasswdd
diff --git a/etc/rc.d/ypserv b/sbin/init/rc.d/ypserv
similarity index 100%
rename from etc/rc.d/ypserv
rename to sbin/init/rc.d/ypserv
diff --git a/etc/rc.d/ypset b/sbin/init/rc.d/ypset
similarity index 100%
rename from etc/rc.d/ypset
rename to sbin/init/rc.d/ypset
diff --git a/etc/rc.d/ypupdated b/sbin/init/rc.d/ypupdated
similarity index 100%
rename from etc/rc.d/ypupdated
rename to sbin/init/rc.d/ypupdated
diff --git a/etc/rc.d/ypxfrd b/sbin/init/rc.d/ypxfrd
similarity index 100%
rename from etc/rc.d/ypxfrd
rename to sbin/init/rc.d/ypxfrd
diff --git a/etc/rc.d/zfs b/sbin/init/rc.d/zfs
similarity index 100%
rename from etc/rc.d/zfs
rename to sbin/init/rc.d/zfs
diff --git a/etc/rc.d/zfsbe b/sbin/init/rc.d/zfsbe
similarity index 100%
rename from etc/rc.d/zfsbe
rename to sbin/init/rc.d/zfsbe
diff --git a/etc/rc.d/zfsd b/sbin/init/rc.d/zfsd
similarity index 100%
rename from etc/rc.d/zfsd
rename to sbin/init/rc.d/zfsd
diff --git a/etc/rc.d/zvol b/sbin/init/rc.d/zvol
similarity index 100%
rename from etc/rc.d/zvol
rename to sbin/init/rc.d/zvol