DELETED DAEMON.init.mk
Index: DAEMON.init.mk
==================================================================
--- DAEMON.init.mk
+++ /dev/null
@@ -1,1 +0,0 @@
-DAEMON: pwcheck sysctl sysdb NETWORK SERVERS ldconfig nfsclient cleartmp

DELETED LOGIN.init.mk
Index: LOGIN.init.mk
==================================================================
--- LOGIN.init.mk
+++ /dev/null
@@ -1,1 +0,0 @@
-LOGIN: DAEMON dntpd msgs powerd

Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -16,21 +16,19 @@
 .SILENT:
 
 install:
 	install rc /etc/rc
 
-.if defined(AUTOBOOT)
-SCRIPTS=${:!find /etc/mrc -name '*.init.mk' -o -name '*.service.mk'!:S/\/etc\/mrc\///}
+SCRIPTS=${:!find /etc/mrc -name '*.service.mk'!:S/\/etc\/mrc\///}
 
+.if defined(AUTOBOOT)
 .ERROR:
 	: ERROR: ABORTING BOOT (sending SIGTERM to parent)!
 	: target ${.ERROR_TARGET} failed to execute:
 	: ${.ERROR_CMD}
 	kill 1
 .else
-SCRIPTS=${:!find /etc/mrc -name '*.service.mk'!:S/\/etc\/mrc\///}
-
 DAEMON: NETWORK SERVERS
 
 LOGIN: DAEMON
 
 NETWORK:
@@ -43,22 +41,22 @@
 test:
 	echo Empty target.
 
 TARGETS:=${SCRIPTS:S/.init.mk//:S/.service.mk//}
 
-.MAIN: ${TARGETS}
-
-.PHONY: ${TARGETS} ${OTHER_TARGETS}
-
-.undef TARGETS OTHER_TARGETS
-
 .for file in ${SCRIPTS}
 #.info ${file}
 .include "${file}"
 .endfor
 
-.undef SCRIPTS
+.include "init.mk"
+
+.MAIN: ${TARGETS}
+
+.PHONY: ${TARGETS} ${OTHER_TARGETS}
+
+.undef TARGETS OTHER_TARGETS SCRIPTS
 
 ENABLED=${:!env!:C/=.*//:M*_ENABLE}
 
 .for var in ${ENABLED}
 .if !empty(${var}:tl:Mno)

DELETED NETWORK.init.mk
Index: NETWORK.init.mk
==================================================================
--- NETWORK.init.mk
+++ /dev/null
@@ -1,1 +0,0 @@
-NETWORK: ifconfig devd hostname

DELETED SERVERS.init.mk
Index: SERVERS.init.mk
==================================================================
--- SERVERS.init.mk
+++ /dev/null
@@ -1,1 +0,0 @@
-SERVERS: swap mountlate syslogd newsyslog

DELETED SERVICE.init.mk
Index: SERVICE.init.mk
==================================================================
--- SERVICE.init.mk
+++ /dev/null
@@ -1,1 +0,0 @@
-SERVICE: ifconfig mount random hostname cleanvar

DELETED adjkerntz.init.mk
Index: adjkerntz.init.mk
==================================================================
--- adjkerntz.init.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-adjkerntz: random mount
-	echo "MRC:$@> Adjust kernel timezone."
-	adjkerntz -i

DELETED bootfs.init.mk
Index: bootfs.init.mk
==================================================================
--- bootfs.init.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-bootfs: fsck
-	echo "MRC:$@> Checking whether we need /boot mounted."
-	mount -vadr | grep -q ' /boot$$' && mount -r /boot || true

DELETED cleanvar.init.mk
Index: cleanvar.init.mk
==================================================================
--- cleanvar.init.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-CLEANVAR_DIRS?=/var/run /var/spool/lock /var/spool/uucp/.Temp
-
-cleanvar: mount
-	echo "MRC:$@> Cleaning 'var's."
-.for dir in ${CLEANVAR_DIRS}
-	-test -d ${dir} && find ${dir} -mindepth 1 -delete
-.endfor
-	install -m644 /dev/null /var/run/utmpx

DELETED cleartmp.init.mk
Index: cleartmp.init.mk
==================================================================
--- cleartmp.init.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-cleartmp: mountlate
-	echo "MRC:$@> Clearing tmp."; \
-	find -x /tmp -mindepth 1 ! -name lost+found \
-	    ! -name snapshots ! -path "./snapshots/*" \
-	    ! -name quota.user ! -name quota.group \
-	    -delete -type d -prune ;\
-	  rm -f /tmp/.X*-lock ;\
-	  rm -fr /tmp/.X11-unix ;\
-	  mkdir -m 1777 /tmp/.X11-unix

DELETED cloned.init.mk
Index: cloned.init.mk
==================================================================
--- cloned.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-cloned: kld
-	echo "MRC:$@> Cloning interfaces: ${CLONED_INTERFACES}"
-.for iface in ${CLONED_INTERFACES}
-	ifconfig ${iface} create
-.endfor

DELETED devfs.init.mk
Index: devfs.init.mk
==================================================================
--- devfs.init.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-DEVFS_CONFIG_FILES?=/etc/defaults/devfs.conf /etc/devfs.conf
-
-devfs:
-	echo "MRC:$@> Applying rules: ${DEVFS_CONFIG_FILES}"
-.for file in ${DEVFS_CONFIG_FILES}
-.if exists(${file})
-	devfsctl -a -f ${file}
-.endif
-.endfor

DELETED dmesg.init.mk
Index: dmesg.init.mk
==================================================================
--- dmesg.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-DMESG_FILE?=/var/run/dmesg.boot
-
-dmesg: mountlate
-	echo "MRC:$@> Writing dmesg."
-	umask 022 ; dmesg -a >> ${DMESG_FILE}

DELETED dumpon.init.mk
Index: dumpon.init.mk
==================================================================
--- dumpon.init.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-DUMPDEV?=no
-
-dumpon: random
-	test -e ${DUMPDEV} && { \
-	  echo "MRC:$@> Setting dumpon device to ${DUMPDEV}"; \
-	  dumpon -v ${DUMPDEV}; \
-	} || true

DELETED fsck.init.mk
Index: fsck.init.mk
==================================================================
--- fsck.init.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-fsck:
-	echo "MRC:$@> Checking disks." ;\
-	fsck -p ;\
-	case $$? in \
-	0) ;; \
-	2) exit 1 \
-	   ;; \
-	4) echo "Rebooting..." ;\
-	   reboot ;\
-	   echo "Reboot failed; help!" ;\
-	   exit 1 \
-	   ;; \
-	8) if [ -n "$${FSCK_Y_ENABLE}" ]; then \
-	     echo "File system preen failed, trying fsck -y." ;\
-	     fsck -y || {\
-	       echo "Automatic file system check failed; help!" ;\
-	       exit 1 ;\
-	     }\
-	   else \
-	     echo "Automatic file system check failed; help!" ;\
-	     exit 1 ;\
-	   fi ;\
-	   ;; \
-	12) echo "Boot interrupted." ;\
-	   exit 1 \
-	   ;; \
-	130) exit 1 \
-	   ;; \
-	*) echo "Unknown error, help!" ;\
-	   exit 1 \
-	   ;; \
-	esac

DELETED hostname.init.mk
Index: hostname.init.mk
==================================================================
--- hostname.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-HOSTNAME?=Amnesiac
-
-hostname:
-	echo "MRC:$@> Setting to ${HOSTNAME}."
-	hostname ${HOSTNAME}

DELETED ifconfig.init.mk
Index: ifconfig.init.mk
==================================================================
--- ifconfig.init.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-IFCONFIG_IFACES?=lo0
-IFCONFIG_lo0?="inet 127.0.0.1/8 up"
-
-ifconfig: adjkerntz wlans cloned kld
-	echo "MRC:$@> Starting interfaces: ${IFCONFIG_IFACES}"
-.for iface in ${IFCONFIG_IFACES}
-.for item in ${IFCONFIG_${iface}}
-	ifconfig ${iface} ${item}
-.endfor
-.endfor

ADDED   init.mk
Index: init.mk
==================================================================
--- /dev/null
+++ init.mk
@@ -0,0 +1,275 @@
+# Meta targets
+
+TARGETS+=adjkerntz bootfs cleanvar cleartmp cloned devfs dmesg dumpon fsck hostname ifconfig kld ldconfig mixer mount mountlate msgs newsyslog nextboot nfsclient pwcheck random root rpc_umntall runshm savecore swap sysctl sysdb wlans
+
+DAEMON: pwcheck sysctl sysdb NETWORK SERVERS ldconfig nfsclient cleartmp
+
+LOGIN: DAEMON dntpd msgs powerd
+
+NETWORK: ifconfig devd hostname
+
+SERVERS: swap mountlate syslogd newsyslog
+
+SERVICE: ifconfig mount random hostname cleanvar
+
+# regular targets
+
+adjkerntz: random mount
+	echo "MRC:$@> Adjust kernel timezone."
+	adjkerntz -i
+
+bootfs: fsck
+	echo "MRC:$@> Checking whether we need /boot mounted."
+	mount -vadr | grep -q ' /boot$$' && mount -r /boot || true
+
+CLEANVAR_DIRS?=/var/run /var/spool/lock /var/spool/uucp/.Temp
+
+cleanvar: mount
+	echo "MRC:$@> Cleaning 'var's."
+.for dir in ${CLEANVAR_DIRS}
+	-test -d ${dir} && find ${dir} -mindepth 1 -delete
+.endfor
+	install -m644 /dev/null /var/run/utmpx
+
+cleartmp: mountlate
+	echo "MRC:$@> Clearing tmp."; \
+	find -x /tmp -mindepth 1 ! -name lost+found \
+	    ! -name snapshots ! -path "./snapshots/*" \
+	    ! -name quota.user ! -name quota.group \
+	    -delete -type d -prune ;\
+	  rm -f /tmp/.X*-lock ;\
+	  rm -fr /tmp/.X11-unix ;\
+	  mkdir -m 1777 /tmp/.X11-unix
+
+cloned: kld
+	echo "MRC:$@> Cloning interfaces: ${CLONED_INTERFACES}"
+.for iface in ${CLONED_INTERFACES}
+	ifconfig ${iface} create
+.endfor
+
+DEVFS_CONFIG_FILES?=/etc/defaults/devfs.conf /etc/devfs.conf
+
+devfs:
+	echo "MRC:$@> Applying rules: ${DEVFS_CONFIG_FILES}"
+.for file in ${DEVFS_CONFIG_FILES}
+.if exists(${file})
+	devfsctl -a -f ${file}
+.endif
+.endfor
+
+DMESG_FILE?=/var/run/dmesg.boot
+
+dmesg: mountlate
+	echo "MRC:$@> Writing dmesg."
+	umask 022 ; dmesg -a >> ${DMESG_FILE}
+
+DUMPDEV?=no
+
+dumpon: random
+	test -e ${DUMPDEV} && { \
+	  echo "MRC:$@> Setting dumpon device to ${DUMPDEV}"; \
+	  dumpon -v ${DUMPDEV}; \
+	} || true
+
+fsck:
+	echo "MRC:$@> Checking disks." ;\
+	fsck -p ;\
+	case $$? in \
+	0) ;; \
+	2) exit 1 \
+	   ;; \
+	4) echo "Rebooting..." ;\
+	   reboot ;\
+	   echo "Reboot failed; help!" ;\
+	   exit 1 \
+	   ;; \
+	8) if [ -n "$${FSCK_Y_ENABLE}" ]; then \
+	     echo "File system preen failed, trying fsck -y." ;\
+	     fsck -y || {\
+	       echo "Automatic file system check failed; help!" ;\
+	       exit 1 ;\
+	     }\
+	   else \
+	     echo "Automatic file system check failed; help!" ;\
+	     exit 1 ;\
+	   fi ;\
+	   ;; \
+	12) echo "Boot interrupted." ;\
+	   exit 1 \
+	   ;; \
+	130) exit 1 \
+	   ;; \
+	*) echo "Unknown error, help!" ;\
+	   exit 1 \
+	   ;; \
+	esac
+
+HOSTNAME?=Amnesiac
+
+hostname:
+	echo "MRC:$@> Setting to ${HOSTNAME}."
+	hostname ${HOSTNAME}
+
+IFCONFIG_IFACES?=lo0
+IFCONFIG_lo0?="inet 127.0.0.1/8 up"
+
+ifconfig: adjkerntz wlans cloned kld
+	echo "MRC:$@> Starting interfaces: ${IFCONFIG_IFACES}"
+.for iface in ${IFCONFIG_IFACES}
+.for item in ${IFCONFIG_${iface}}
+	ifconfig ${iface} ${item}
+.endfor
+.endfor
+
+kld: bootfs
+.if defined(KLD_LIST)
+	echo "MRC:$@> Loading kernel modules: ${KLD_LIST}"
+	kldload -n ${KLD_LIST}
+.endif
+
+LDCONFIG_PATHS?=/lib /usr/lib /usr/local/lib /usr/pkg/lib
+LDCONFIG_LOCAL_DIRS?=/usr/local/libdata/ldconfig
+
+.for path in ${LDCONFIG_PATHS} /etc/ld-elf.so.conf
+.if exists(${path})
+ldc+=${path}
+.endif
+.endfor
+
+.for dir in ${LDCONFIG_LOCAL_DIRS}
+.if exists(${dir})
+ldc+=${:!find ${dir} -type f!}
+.endif
+.endfor
+
+ldconfig: mountlate
+	echo "MRC:$@> Initializing shared libraries: ${ldc}"; \
+	ldconfig -elf ${ldc}
+
+mixers=${:!find /dev -name 'mixer*'!:S/\/dev\///}
+
+mixer: mount cleanvar
+	echo "MRC:$@> Restoring levels."
+.for mixer in ${mixers}
+	-test -f /var/db/${mixer}-state && mixer -f /dev/${mixer} `cat /var/db/${mixer}-state`
+.endfor
+
+NETFS_TYPES?=nfs:NFS smbfs:SMB
+
+excludes=${NETFS_TYPES:C/:.*//}
+
+mount: root
+	echo "MRC:$@> Mount local FS."
+	mount -a -t no${excludes:ts,}
+
+mountlate: NETWORK mount cleanvar runshm devd
+	echo "MRC:$@> Mount late FS."
+	mount -a
+
+msgs: mount
+	echo "MRC:$@> Making bounds." ;\
+	  test ! -d /var/msgs -o -f /var/msgs/bound -o -L /var/msgs/bounds || \
+	  echo 0 > /var/msgs/bounds
+
+NEWSYSLOG_ENABLE?=no
+
+newsyslog: mountlate sysdb
+	test -z "$${NEWSYSLOG_ENABLE}" || \
+	  echo "MRC:$@> Trimming log files." ;\
+	  /usr/sbin/newsyslog ${NEWSYSLOG_FLAGS}
+
+nextboot: mount
+.if exists(/boot/nextkernel)
+	echo "MRC:$@> Removing nextboot setting."
+	rm -f /boot/nextkernel
+.endif
+
+NFSCLIENT_ENABLE?=no
+
+.if empty(NFSCLIENT_ENABLE:tl:Mno)
+DAEMON_rpcbind_ENABLE=yes
+.endif
+
+nfsclient: NETWORK rpcbind rpc_umntall
+	test -z "$${NFSCLIENT_ENABLE}" || kldload -n nfs
+
+pwcheck: mountlate syslogd
+	echo "MRC:$@> Checking password lock file."
+.if exists(/etc/ptmp)
+	logger -s -p auth.err "password file may be incorrect -- /etc/ptmp exists"
+.endif
+
+ENTROPY_FILE?=/var/db/entropy/random
+ENTROPY_DIR?=/var/db/entropy
+
+random: mount devfs
+	echo "MRC:$@> Seeding."
+	sysctl kern.seedenable=1 > /dev/null
+	( ps -fauxww; ${SYSCTL} -a; date; df -ib; dmesg; ps -fauxww; ) 2>&1 | dd status=none of=/dev/random bs=8k
+	cat /bin/ls | dd status=none of=/dev/random bs=8k
+.if exists(ENTROPY_DIR)
+.for file in ${:!find ${ENTROPY_DIR} -type f!}
+	dd status=none if=${file} of=/dev/random bs=8k
+.endfor
+.elif exists(ENTROPY_FILE)
+	dd status=none if=${ENTROPY_FILE} of=/dev/random bs=8k
+.endif
+	sysctl kern.seedenable=0 > /dev/null
+
+root: fsck bootfs
+	echo "MRC:$@> Mount root R/W."
+	mount -uo rw /
+	umount -a
+
+rpc_umntall: mountlate NETWORK rpcbind
+.if empty(RPC_UMNTALL_ENABLE:tl:Mno)
+	echo "MRC:$@> Sending RPC unmount notifications."; \
+	test -f /var/db/mounttab || true && \
+	  rpc.umntall -k &
+.endif
+
+runshm: cleanvar
+	echo "MRC:$@> Mount and populate /var/run/shm."; \
+	mkdir -p /var/run/shm; \
+	mount_tmpfs -m 01777 dummy /var/run/shm; \
+	mkdir -p -m 01777 /var/run/shm/tmp; \
+
+DUMPDIR?=/var/crash
+CRASHINFO_ENABLE?=no
+
+savecore: dumpon
+.if empty(DUMPDEV:tl:Mno) && exists(${DUMPDEV}) && exists(${DUMPDIR})
+	echo "MRC:$@> Saving coredump."; \
+	savecore ${DUMPDIR} ${DUMPDEV}
+.if empty(CRASHINFO_ENABLE:tl:Mno)
+	crashinfo -d ${DUMPDIR}
+.endif
+.endif
+
+swap: savecore
+.if ${:!sysctl -n vm.swap_enabled!}} != 0
+	echo "MRC:$@> Enabling swap."; \
+	swapon -a
+.endif
+
+sysctl: kld root
+.if exists(/etc/sysctl.conf)
+	echo "MRC:$@> Setting sysctl defaults."; \
+	awk '$$0~/^[ ]*(#.*)?$$/{next}{print}' < /etc/sysctl.conf | xargs -n1 sysctl
+.endif
+
+sysdb: mountlate
+	echo "MRC:$@> Building databases."; \
+	dev_mkdb; \
+	install -c -m 644 -g wheel /dev/null /var/run/utmpx
+
+wlans: kld
+	echo "MRC:$@> Configuring wlans."; \
+	for dev in `sysctl -n net.wlan.devices`; do \
+	  eval all_wlans=\$${WLANS_$${dev}}; \
+	  for wlan in $${all_wlans}; do \
+	    eval wlan_args=\$${WLANS_$${wlan}_ARGS}; \
+	    ifconfig $${wlan} create wlandev $${dev} $${wlan_args}; \
+	    ifconfig $${wlan} up; \
+	  done; \
+	done

DELETED kld.init.mk
Index: kld.init.mk
==================================================================
--- kld.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-kld: bootfs
-.if defined(KLD_LIST)
-	echo "MRC:$@> Loading kernel modules: ${KLD_LIST}"
-	kldload -n ${KLD_LIST}
-.endif

DELETED ldconfig.init.mk
Index: ldconfig.init.mk
==================================================================
--- ldconfig.init.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LDCONFIG_PATHS?=/lib /usr/lib /usr/local/lib /usr/pkg/lib
-LDCONFIG_LOCAL_DIRS?=/usr/local/libdata/ldconfig
-
-.for path in ${LDCONFIG_PATHS} /etc/ld-elf.so.conf
-.if exists(${path})
-ldc+=${path}
-.endif
-.endfor
-
-.for dir in ${LDCONFIG_LOCAL_DIRS}
-.if exists(${dir})
-ldc+=${:!find ${dir} -type f!}
-.endif
-.endfor
-
-ldconfig: mountlate
-	echo "MRC:$@> Initializing shared libraries: ${ldc}"; \
-	ldconfig -elf ${ldc}

DELETED mixer.init.mk
Index: mixer.init.mk
==================================================================
--- mixer.init.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-mixers=${:!find /dev -name 'mixer*'!:S/\/dev\///}
-
-mixer: mount cleanvar
-	echo "MRC:$@> Restoring levels."
-.for mixer in ${mixers}
-	-test -f /var/db/${mixer}-state && mixer -f /dev/${mixer} `cat /var/db/${mixer}-state`
-.endfor

DELETED mount.init.mk
Index: mount.init.mk
==================================================================
--- mount.init.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-NETFS_TYPES?=nfs:NFS smbfs:SMB
-
-excludes=${NETFS_TYPES:C/:.*//}
-
-mount: root
-	echo "MRC:$@> Mount local FS."
-	mount -a -t no${excludes:ts,}

DELETED mountlate.init.mk
Index: mountlate.init.mk
==================================================================
--- mountlate.init.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-mountlate: NETWORK mount cleanvar runshm devd
-	echo "MRC:$@> Mount late FS."
-	mount -a

DELETED msgs.init.mk
Index: msgs.init.mk
==================================================================
--- msgs.init.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-msgs: mount
-	echo "MRC:$@> Making bounds." ;\
-	  test ! -d /var/msgs -o -f /var/msgs/bound -o -L /var/msgs/bounds || \
-	  echo 0 > /var/msgs/bounds

DELETED newsyslog.init.mk
Index: newsyslog.init.mk
==================================================================
--- newsyslog.init.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-NEWSYSLOG_ENABLE?=no
-
-newsyslog: mountlate sysdb
-	test -z "$${NEWSYSLOG_ENABLE}" || \
-	  echo "MRC:$@> Trimming log files." ;\
-	  /usr/sbin/newsyslog ${NEWSYSLOG_FLAGS}

DELETED nextboot.init.mk
Index: nextboot.init.mk
==================================================================
--- nextboot.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-nextboot: mount
-.if exists(/boot/nextkernel)
-	echo "MRC:$@> Removing nextboot setting."
-	rm -f /boot/nextkernel
-.endif

DELETED nfsclient.init.mk
Index: nfsclient.init.mk
==================================================================
--- nfsclient.init.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-NFSCLIENT_ENABLE?=no
-
-.if empty(NFSCLIENT_ENABLE:tl:Mno)
-DAEMON_rpcbind_ENABLE=yes
-.endif
-
-nfsclient: NETWORK rpcbind rpc_umntall
-	test -z "$${NFSCLIENT_ENABLE}" || kldload -n nfs

DELETED pwcheck.init.mk
Index: pwcheck.init.mk
==================================================================
--- pwcheck.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-pwcheck: mountlate syslogd
-	echo "MRC:$@> Checking password lock file."
-.if exists(/etc/ptmp)
-	logger -s -p auth.err "password file may be incorrect -- /etc/ptmp exists"
-.endif

DELETED random.init.mk
Index: random.init.mk
==================================================================
--- random.init.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-ENTROPY_FILE?=/var/db/entropy/random
-ENTROPY_DIR?=/var/db/entropy
-
-random: mount devfs
-	echo "MRC:$@> Seeding."
-	sysctl kern.seedenable=1 > /dev/null
-	( ps -fauxww; ${SYSCTL} -a; date; df -ib; dmesg; ps -fauxww; ) 2>&1 | dd status=none of=/dev/random bs=8k
-	cat /bin/ls | dd status=none of=/dev/random bs=8k
-.if exists(ENTROPY_DIR)
-.for file in ${:!find ${ENTROPY_DIR} -type f!}
-	dd status=none if=${file} of=/dev/random bs=8k
-.endfor
-.elif exists(ENTROPY_FILE)
-	dd status=none if=${ENTROPY_FILE} of=/dev/random bs=8k
-.endif
-	sysctl kern.seedenable=0 > /dev/null

DELETED root.init.mk
Index: root.init.mk
==================================================================
--- root.init.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-root: fsck bootfs
-	echo "MRC:$@> Mount root R/W."
-	mount -uo rw /
-	umount -a

DELETED rpc_umntall.init.mk
Index: rpc_umntall.init.mk
==================================================================
--- rpc_umntall.init.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-rpc_umntall: mountlate NETWORK rpcbind
-.if empty(RPC_UMNTALL_ENABLE:tl:Mno)
-	echo "MRC:$@> Sending RPC unmount notifications."; \
-	test -f /var/db/mounttab || true && \
-	  rpc.umntall -k &
-.endif

DELETED runshm.init.mk
Index: runshm.init.mk
==================================================================
--- runshm.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-runshm: cleanvar
-	echo "MRC:$@> Mount and populate /var/run/shm."; \
-	mkdir -p /var/run/shm; \
-	mount_tmpfs -m 01777 dummy /var/run/shm; \
-	mkdir -p -m 01777 /var/run/shm/tmp; \

DELETED savecore.init.mk
Index: savecore.init.mk
==================================================================
--- savecore.init.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-DUMPDIR?=/var/crash
-CRASHINFO_ENABLE?=no
-
-savecore: dumpon
-.if empty(DUMPDEV:tl:Mno) && exists(${DUMPDEV}) && exists(${DUMPDIR})
-	echo "MRC:$@> Saving coredump."; \
-	savecore ${DUMPDIR} ${DUMPDEV}
-.if empty(CRASHINFO_ENABLE:tl:Mno)
-	crashinfo -d ${DUMPDIR}
-.endif
-.endif

DELETED swap.init.mk
Index: swap.init.mk
==================================================================
--- swap.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-swap: savecore
-.if ${:!sysctl -n vm.swap_enabled!}} != 0
-	echo "MRC:$@> Enabling swap."; \
-	swapon -a
-.endif

DELETED sysctl.init.mk
Index: sysctl.init.mk
==================================================================
--- sysctl.init.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-sysctl: kld root
-.if exists(/etc/sysctl.conf)
-	echo "MRC:$@> Setting sysctl defaults."; \
-	awk '$$0~/^[ ]*(#.*)?$$/{next}{print}' < /etc/sysctl.conf | xargs -n1 sysctl
-.endif

DELETED sysdb.init.mk
Index: sysdb.init.mk
==================================================================
--- sysdb.init.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-sysdb: mountlate
-	echo "MRC:$@> Building databases."; \
-	dev_mkdb; \
-	install -c -m 644 -g wheel /dev/null /var/run/utmpx

DELETED wlans.init.mk
Index: wlans.init.mk
==================================================================
--- wlans.init.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-wlans: kld
-	echo "MRC:$@> Configuring wlans."; \
-	for dev in `sysctl -n net.wlan.devices`; do \
-	  eval all_wlans=\$${WLANS_$${dev}}; \
-	  for wlan in $${all_wlans}; do \
-	    eval wlan_args=\$${WLANS_$${wlan}_ARGS}; \
-	    ifconfig $${wlan} create wlandev $${dev} $${wlan_args}; \
-	    ifconfig $${wlan} up; \
-	  done; \
-	done