d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r320138:

Browse Source 
Fixed bsdinstall location of vfs.zfs.min_auto_ashift

Sponsored by:	Multiplay
This commit is contained in:
Steven Hartland 2018-03-31 19:21:57 +00:00
parent 8848efc37c
commit fdb6fc983d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/bsdinstall/scripts/config
View File

@ -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

2
usr.sbin/bsdinstall/scripts/zfsboot
View File

@ -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