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

[Dimitry Andric]

Author: dim
Date: Mon Aug  1 19:49:42 2016
New Revision: 303631
URL: https://svnweb.freebsd.org/changeset/base/303631

Log:
  Fix non-functional bsdinstall services dialog.
  
  The most recent version of bsdinstall does not seem to respect any of
  the checkboxes in the "Choose the services you would like to be started
  at boot" dialog.  None of the chosen services end up in the rc.conf file
  that is installed onto the target system.
  
  This is caused by the bsdinstall/scripts/hardening script, which
  implements the new hardening options dialog.  The script starts by
  overwriting the previously written rc.conf.services file:
  
      echo -n > $BSDINSTALL_TMPETC/rc.conf.services
  
  which is obviously incorrect.  It should clear out rc.conf.hardening
  instead.
  
  Reviewed by:	allanjude
  PR:		211506
  MFC after:	3 days
  Differential Revision: https://reviews.freebsd.org/D7387

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

Modified: head/usr.sbin/bsdinstall/scripts/hardening
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/hardening	Mon Aug  1 19:37:43 2016	(r303630)
+++ head/usr.sbin/bsdinstall/scripts/hardening	Mon Aug  1 19:49:42 2016	(r303631)
@@ -28,7 +28,7 @@
 
 : ${DIALOG_OK=0}
 
-echo -n > $BSDINSTALL_TMPETC/rc.conf.services
+echo -n > $BSDINSTALL_TMPETC/rc.conf.hardening
 
 exec 3>&1
 FEATURES=$( dialog --backtitle "FreeBSD Installer" \