Author: allanjude
Date: Thu Jun 15 17:44:16 2017
New Revision: 319983
URL: https://svnweb.freebsd.org/changeset/base/319983
Log:
MFC: r319863
bsdinstall: Make ZFS min_auto_ashift adjustment persistent
MFC: r319864
bsdinstall: support Auto ZFS mode for ARM64
Approved by: re (gjb)
Modified:
stable/11/usr.sbin/bsdinstall/scripts/auto
stable/11/usr.sbin/bsdinstall/scripts/zfsboot
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- stable/11/usr.sbin/bsdinstall/scripts/auto Thu Jun 15 17:43:40 2017
(r319982)
+++ stable/11/usr.sbin/bsdinstall/scripts/auto Thu Jun 15 17:44:16 2017
(r319983)
@@ -260,7 +260,7 @@ Shell \"Open a shell and partition by hand\""
CURARCH=$( uname -m )
case $CURARCH in
- amd64|i386) # Booting ZFS Supported
+ amd64|arm64|i386) # Booting ZFS Supported
PMODES="$PMODES \"Auto (ZFS)\" \"Guided Root-on-ZFS\""
;;
*) # Booting ZFS Unspported
Modified: stable/11/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- stable/11/usr.sbin/bsdinstall/scripts/zfsboot Thu Jun 15 17:43:40
2017 (r319982)
+++ stable/11/usr.sbin/bsdinstall/scripts/zfsboot Thu Jun 15 17:44:16
2017 (r319983)
@@ -1443,6 +1443,12 @@ zfs_create_boot()
'kern.geom.label.gptid.enable=\"0\"' \
$BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+ 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
+ fi
+
if [ "$ZFSBOOT_SWAP_MIRROR" ]; then
f_eval_catch $funcname echo "$ECHO_APPEND" \
'geom_mirror_load=\"YES\"' \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
