Index: init.mk
==================================================================
--- init.mk
+++ init.mk
@@ -130,20 +130,19 @@
 ldconfig: mountlate
 	echo "MRC:$@> Initializing shared libraries: ${ldc}"; \
 	ldconfig -elf ${ldc}
 
 microcode: mountlate
-.if exists(/usr/local/share/cpucontrol)
-	echo "MRC:$@> Updating." ;\
+	test -d /usr/local/share/cpucontrol || exit 0 ;\
+	echo "MRC:$@> Updating microcode." ;\
 	kldload -n cpuctl || exit 1 ;\
-	for cpu in $$(jot "$$(sysctl -n hw.ncpu)" 0); do \
+	for cpu in $$(jot ${NCPU} 0); do \
 	  ( cpucontrol -u -d /usr/local/share/cpucontrol /dev/cpuctl$${cpu} \
-	      || exit 1 \
+	    || exit 1 \
 	  ) | grep -v '^TEST' ;\
 	  cpucontrol -e /dev/cpuctl$${cpu} || exit 1 ;\
 	done
-.endif
 
 mixers=${:!find /dev -name 'mixer*'!:S/\/dev\///}
 
 mixer: mount cleanvar
 	echo "MRC:$@> Restoring levels."
@@ -153,15 +152,17 @@
 .endfor
 
 excludes=${NETFS_TYPES:C/:.*//}
 
 mount: root zfs
-	echo "MRC:$@> Mount local FS."
+	echo "MRC:$@> Mount local FS." ;\
+	mount -uo rw -a ;\
+	mount ;\
 	mount -a -t no${excludes:ts,}
 
 mountlate: NETWORK mount cleanvar runshm devd
-	echo "MRC:$@> Mount late FS."
+	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 || \
@@ -227,13 +228,12 @@
 	  dd status=none if=${ENTROPY_FILE} of=/dev/random bs=8k ;\
 	} ;\
 	sysctl kern.seedenable=0 > /dev/null
 
 root: fsck bootfs
-	echo "MRC:$@> Mount root R/W."
-	mount -uo rw /
-	umount -a
+	echo "MRC:$@> Mount root R/W." ;\
+	mount -uo rw
 
 rpc_umntall: mountlate NETWORK rpcbind
 .if empty(RPC_UMNTALL_ENABLE:tl:Mno)
 	echo "MRC:$@> Sending RPC unmount notifications."; \
 	test -f /var/db/mounttab || true && \
@@ -268,11 +268,10 @@
 	  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 \