svn commit: r256348 - head/usr.sbin/bsdinstall/scripts

[Devin Teske]

Author: dteske
Date: Fri Oct 11 21:23:44 2013
New Revision: 256348
URL: http://svnweb.freebsd.org/changeset/base/256348

Log:
  Remove the dumpdev configuration dialog, merge it into the regular
  services configuration and enable it by default. Committed with
  slight change to menu text for length and content.
  
  Submitted by:	Allan Jude <freebsd at allanjude.com>
  Approved by:	re (glebius)

Modified:
  head/usr.sbin/bsdinstall/scripts/services

Modified: head/usr.sbin/bsdinstall/scripts/services
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/services	Fri Oct 11 21:12:48 2013	(r256347)
+++ head/usr.sbin/bsdinstall/scripts/services	Fri Oct 11 21:23:44 2013	(r256348)
@@ -46,22 +46,23 @@ DAEMONS=$(dialog --backtitle "FreeBSD In
 	moused	"PS/2 mouse pointer on console" ${moused_enable:-off} \
 	ntpd	"Synchronize system and network time" ${ntpd_enable:-off} \
 	powerd	"Adjust CPU frequency dynamically if supported" ${powerd_enable:-off} \
+	dumpdev "Enable kernel crash dumps to /var/crash" ${dumpdev:-on} \
 2>&1 1>&3)
 exec 3>&-
 
+local havedump=
 for daemon in $DAEMONS; do
+	if [ "$daemon" == "dumpdev" ]; then
+		havedump=1
+		echo \# Set dumpdev to \"AUTO\" to enable crash dumps, \
+			\"NO\" to disable >> \ 
+			$BSDINSTALL_TMPETC/rc.conf.services
+		echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
+		continue
+	fi
 	echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services
 done
 
-echo \# Set dumpdev to \"AUTO\" to enable crash dumps, \"NO\" to disable >> \
-	$BSDINSTALL_TMPETC/rc.conf.services
-
-dialog --backtitle "FreeBSD Installer" --title "Dumpdev Configuration" \
-	--nocancel --yesno \
-	"Would you like to enable crash dumps?  If you start having problems with the system it can help the FreeBSD developers debug the problem.  But the crash dumps can take up a lot of disk space in /var." 0 0
-
-if [ $? -eq $DIALOG_OK ]; then
-	echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
-else
+if [ ! "$havedump" ]; then
 	echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services
 fi