svn commit: r217547 - in user/nwhitehorn/bsdinstall: release scripts
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Tue Jan 18 17:48:22 UTC 2011
Author: nwhitehorn
Date: Tue Jan 18 17:48:21 2011
New Revision: 217547
URL: http://svn.freebsd.org/changeset/base/217547
Log:
Warn user of impending reboot and move location of reboot dialog from auto
to the rc.local wrapper script.
Modified:
user/nwhitehorn/bsdinstall/release/rc.local
user/nwhitehorn/bsdinstall/scripts/auto
Modified: user/nwhitehorn/bsdinstall/release/rc.local
==============================================================================
--- user/nwhitehorn/bsdinstall/release/rc.local Tue Jan 18 17:35:34 2011 (r217546)
+++ user/nwhitehorn/bsdinstall/release/rc.local Tue Jan 18 17:48:21 2011 (r217547)
@@ -16,6 +16,7 @@ $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
;;
$DIALOG_CANCEL) # Live CD
Modified: user/nwhitehorn/bsdinstall/scripts/auto
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/auto Tue Jan 18 17:35:34 2011 (r217546)
+++ user/nwhitehorn/bsdinstall/scripts/auto Tue Jan 18 17:48:21 2011 (r217547)
@@ -84,7 +84,5 @@ bsdinstall adduser
trap error SIGINT # SIGINT is bad again
bsdinstall config || error
-dialog --backtitle "FreeBSD Installer" --title "Complete" --msgbox "Installation of FreeBSD complete!" 0 0
-
echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG
More information about the svn-src-user
mailing list