Index: usr.sbin/bsdinstall/scripts/auto
===================================================================
--- usr.sbin/bsdinstall/scripts/auto
+++ usr.sbin/bsdinstall/scripts/auto
@@ -147,7 +147,7 @@
 mkdir $BSDINSTALL_TMPETC
 
 trap true SIGINT	# This section is optional
-bsdinstall keymap
+[ -z "$BSDINSTALL_KEYMAP_SKIP" ] && bsdinstall keymap
 
 trap error SIGINT	# Catch cntrl-C here
 bsdinstall hostname || error "Set hostname failed"
@@ -354,11 +354,12 @@
 if [ "$NETCONFIG_DONE" != yes ]; then
 	bsdinstall netconfig	# Don't check for errors -- the user may cancel
 fi
-bsdinstall time
-bsdinstall services
-bsdinstall hardening
+[ -z "$BSDINSTALL_TIME_SKIP" ] && bsdinstall time
+[ -z "$BSDINSTALL_SERVICES_SKIP" ] && bsdinstall services
+[ -z "$BSDINSTALL_HARDENING_SKIP" ] && bsdinstall hardening
 
-dialog --backtitle "$OSNAME Installer" --title "Add User Accounts" --yesno \
+[ -z "$BSDINSTALL_USERS_SKIP" ] && dialog --backtitle "$OSNAME Installer" \
+	--title "Add User Accounts" --yesno \
     "Would you like to add users to the installed system now?" 0 0 && \
     bsdinstall adduser
 
@@ -424,14 +425,16 @@
 	rm -rf "$BSDINSTALL_FETCHDEST"
 fi
 
-dialog --backtitle "$OSNAME Installer" --title "Manual Configuration" \
-    --default-button no --yesno \
-   "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0
-if [ $? -eq 0 ]; then
-	clear
-	echo This shell is operating in a chroot in the new system. \
-	    When finished making configuration changes, type \"exit\".
-	chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1
+if [ -z "$BSDINSTALL_MANUAL_SKIP" ]; then
+	dialog --backtitle "$OSNAME Installer" --title "Manual Configuration" \
+		--default-button no --yesno \
+		"The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0
+	if [ $? -eq 0 ]; then
+		clear
+		echo This shell is operating in a chroot in the new system. \
+		    When finished making configuration changes, type \"exit\".
+		chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1
+	fi
 fi
 
 bsdinstall entropy