aboutsummaryrefslogtreecommitdiff
path: root/release/rc.local
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-04-09 14:25:58 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-04-09 14:25:58 +0000
commit7c3d04b87b5a51ed261dd0802513cc6c99a33fe7 (patch)
treefdd2d37fa060df021c5624a2fea3906cbc8109f4 /release/rc.local
parent23724537d0c2f60e4c58f6ab3da58f08b33a6496 (diff)
downloadsrc-7c3d04b87b5a51ed261dd0802513cc6c99a33fe7.tar.gz
src-7c3d04b87b5a51ed261dd0802513cc6c99a33fe7.zip
Allow the user to use the live environment post-installation, as well
as improving error handling.
Notes
Notes: svn path=/head/; revision=220500
Diffstat (limited to 'release/rc.local')
-rwxr-xr-xrelease/rc.local7
1 files changed, 5 insertions, 2 deletions
diff --git a/release/rc.local b/release/rc.local
index 24285e0fd198..d583381446f5 100755
--- a/release/rc.local
+++ b/release/rc.local
@@ -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