svn commit: r220500 - head/release

Nathan Whitehorn nwhitehorn at FreeBSD.org
Sat Apr 9 14:25:59 UTC 2011


Author: nwhitehorn
Date: Sat Apr  9 14:25:58 2011
New Revision: 220500
URL: http://svn.freebsd.org/changeset/base/220500

Log:
  Allow the user to use the live environment post-installation, as well
  as improving error handling.

Modified:
  head/release/rc.local

Modified: head/release/rc.local
==============================================================================
--- head/release/rc.local	Sat Apr  9 14:18:03 2011	(r220499)
+++ head/release/rc.local	Sat Apr  9 14:25:58 2011	(r220500)
@@ -17,8 +17,11 @@ $DIALOG_OK)	# Install
 	BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT
 	trap true SIGINT	# Ignore cntrl-C here
 	bsdinstall
-	dialog --backtitle "FreeBSD Installer" --title "Complete" --msgbox "Installation of FreeBSD complete! The system will now reboot." 0 0
-	reboot
+	if [ $? -eq 0 ]; then
+		dialog --backtitle "FreeBSD Installer" --title "Complete" --yes-label "Reboot" --no-label "Live CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 && reboot
+	else
+		. /etc/rc.local
+	fi
 	;;
 $DIALOG_CANCEL)	# Live CD
 	exit 0


More information about the svn-src-all mailing list