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

[Steven Hartland]

Author: smh
Date: Tue Jun 20 08:03:50 2017
New Revision: 320138
URL: https://svnweb.freebsd.org/changeset/base/320138

Log:
  Fixed bsdinstall location of vfs.zfs.min_auto_ashift
  
  vfs.zfs.min_auto_ashift is a sysctl only not a tunable so updated bsdinstall
  to use the correct location /etc/sysctl.conf instead of /boot/loader.conf
  
  Reported by:	Aaron Caza
  Reviewed by:	allanjude
  MFC after:	2 days
  Sponsored by:	Multiplay
  Differential Revision:	https://reviews.freebsd.org/D11278

Modified:
  head/usr.sbin/bsdinstall/scripts/config
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/config
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/config	Tue Jun 20 08:01:13 2017	(r320137)
+++ head/usr.sbin/bsdinstall/scripts/config	Tue Jun 20 08:03:50 2017	(r320138)
@@ -32,7 +32,7 @@
 cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
 rm $BSDINSTALL_TMPETC/rc.conf.*
 
-cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.hardening >> $BSDINSTALL_TMPETC/sysctl.conf
+cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.* >> $BSDINSTALL_TMPETC/sysctl.conf
 rm $BSDINSTALL_TMPETC/sysctl.conf.*
 
 cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Tue Jun 20 08:01:13 2017	(r320137)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Tue Jun 20 08:03:50 2017	(r320138)
@@ -1446,7 +1446,7 @@ zfs_create_boot()
 	if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
 		f_eval_catch $funcname echo "$ECHO_APPEND" \
 	             'vfs.zfs.min_auto_ashift=12' \
-	             $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+	             $BSDINSTALL_TMPETC/sysctl.conf.zfs || return $FAILURE
 	fi
 
 	if [ "$ZFSBOOT_SWAP_MIRROR" ]; then