Index: etc/rc
===================================================================
--- etc/rc	(revision 256432)
+++ etc/rc	(working copy)
@@ -81,6 +81,9 @@
 		skip="$skip -s nojailvnet"
 	fi
 fi
+if ! [ -e /var/db/firstboot ]; then
+	skip="$skip -s firstboot"
+fi
 
 # Do a first pass to get everything up to $early_late_divider so that
 # we can do a second pass that includes $local_startup directories
@@ -116,6 +119,13 @@
 	run_rc_script ${_rc_elem} ${_boot}
 done
 
+if [ -e /var/db/firstboot ]; then
+	rm /var/db/firstboot
+	if [ -e /var/db/firstboot-reboot ]; then
+		rm /var/db/firstboot-reboot
+		kill -INT 1
+	fi
+fi
 echo ''
 date
 exit 0