Date: Sat, 31 Mar 2018 19:21:57 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r331851 - stable/11/usr.sbin/bsdinstall/scripts Message-ID: <201803311921.w2VJLvi2061560@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Sat Mar 31 19:21:57 2018 New Revision: 331851 URL: https://svnweb.freebsd.org/changeset/base/331851 Log: MFC r320138: Fixed bsdinstall location of vfs.zfs.min_auto_ashift Sponsored by: Multiplay Modified: stable/11/usr.sbin/bsdinstall/scripts/config stable/11/usr.sbin/bsdinstall/scripts/zfsboot Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bsdinstall/scripts/config ============================================================================== --- stable/11/usr.sbin/bsdinstall/scripts/config Sat Mar 31 19:19:22 2018 (r331850) +++ stable/11/usr.sbin/bsdinstall/scripts/config Sat Mar 31 19:21:57 2018 (r331851) @@ -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: stable/11/usr.sbin/bsdinstall/scripts/zfsboot ============================================================================== --- stable/11/usr.sbin/bsdinstall/scripts/zfsboot Sat Mar 31 19:19:22 2018 (r331850) +++ stable/11/usr.sbin/bsdinstall/scripts/zfsboot Sat Mar 31 19:21:57 2018 (r331851) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803311921.w2VJLvi2061560>