Date: Sat, 3 Dec 2011 17:17:32 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r228241 - releng/9.0/usr.sbin/bsdinstall/scripts Message-ID: <201112031717.pB3HHWlv049194@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Sat Dec 3 17:17:32 2011 New Revision: 228241 URL: http://svn.freebsd.org/changeset/base/228241 Log: MFC r228194, MF9 r228240: Prevent user astonishment by providing the shell option at the end, after any installer-provided configuration files have been copied. This allows users to edit their fstab, if desired, and to see what the installer has placed in rc.conf. Requested by: phk Approved by: re (kensmith) Modified: releng/9.0/usr.sbin/bsdinstall/scripts/auto Directory Properties: releng/9.0/usr.sbin/bsdinstall/ (props changed) releng/9.0/usr.sbin/bsdinstall/scripts/ (props changed) Modified: releng/9.0/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- releng/9.0/usr.sbin/bsdinstall/scripts/auto Sat Dec 3 17:15:16 2011 (r228240) +++ releng/9.0/usr.sbin/bsdinstall/scripts/auto Sat Dec 3 17:17:32 2011 (r228241) @@ -157,7 +157,7 @@ finalconfig() { exec 3>&1 REVISIT=$(dialog --backtitle "FreeBSD Installer" \ --title "Final Configuration" --no-cancel --menu \ - "Setup of your FreeBSD system is nearly complete. You can now modify your configuration choices or apply more complex changes using a shell." 0 0 0 \ + "Setup of your FreeBSD system is nearly complete. You can now modify your configuration choices. After this screen, you will have an opportunity to make more complex changes using a shell." 0 0 0 \ "Exit" "Apply configuration and exit installer" \ "Add User" "Add a user to the system" \ "Root Password" "Change root password" \ @@ -165,8 +165,7 @@ finalconfig() { "Network" "Networking configuration" \ "Services" "Set daemons to run on startup" \ "Time Zone" "Set system timezone" \ - "Handbook" "Install FreeBSD Handbook (requires network)" \ - "Shell" "Open a shell in the new system" 2>&1 1>&3) + "Handbook" "Install FreeBSD Handbook (requires network)" 2>&1 1>&3) exec 3>&- case "$REVISIT" in @@ -198,15 +197,6 @@ finalconfig() { bsdinstall docsinstall finalconfig ;; - "Shell") - 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 - # Don't hose local rc.conf changes - cp $BSDINSTALL_CHROOT/etc/rc.conf $BSDINSTALL_TMPETC/rc.conf.manual - finalconfig - ;; esac } @@ -222,5 +212,14 @@ if [ ! -z "$BSDINSTALL_FETCHDEST" ]; the rm -rf "$BSDINSTALL_FETCHDEST" fi +dialog --backtitle "FreeBSD Installer" --title "Manual Configuration" \ + --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 + echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112031717.pB3HHWlv049194>