diff options
| author | smh <smh@FreeBSD.org> | 2018-03-31 19:21:57 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2018-03-31 19:21:57 +0000 |
| commit | 729f151d16145617a22e82f3e44c3a6259761957 (patch) | |
| tree | ab71cf7a5bc0684bb0f4e78a357d208ea23cd030 /usr.sbin | |
| parent | 6eedfdb590a8f136e4c1fd16a5f90dbe6caea6f7 (diff) | |
| download | FreeBSD-src-729f151d16145617a22e82f3e44c3a6259761957.zip FreeBSD-src-729f151d16145617a22e82f3e44c3a6259761957.tar.gz | |
MFC r320138:
Fixed bsdinstall location of vfs.zfs.min_auto_ashift
Sponsored by: Multiplay
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/config | 2 | ||||
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config index c86a381..4b3a653 100755 --- a/usr.sbin/bsdinstall/scripts/config +++ b/usr.sbin/bsdinstall/scripts/config @@ -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 diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 49a1af3..f6d0cdd 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -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 |
