svn commit: r303749 - stable/11/usr.sbin/bsdinstall/scripts

[Dimitry Andric]

Author: dim
Date: Thu Aug  4 17:26:32 2016
New Revision: 303749
URL: https://svnweb.freebsd.org/changeset/base/303749

Log:
  MFC r303631:
  
  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.
  
  Approved by:	re (kib)
  Reviewed by:	allanjude
  PR:		211506
  Differential Revision: https://reviews.freebsd.org/D7387

Modified:
  stable/11/usr.sbin/bsdinstall/scripts/hardening
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/bsdinstall/scripts/hardening
==============================================================================
--- stable/11/usr.sbin/bsdinstall/scripts/hardening	Thu Aug  4 16:36:00 2016	(r303748)
+++ stable/11/usr.sbin/bsdinstall/scripts/hardening	Thu Aug  4 17:26:32 2016	(r303749)
@@ -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" \