diff options
| author | allanjude <allanjude@FreeBSD.org> | 2017-06-15 17:44:16 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2017-06-15 17:44:16 +0000 |
| commit | 1920865965040604392f234b2208b526a57ada58 (patch) | |
| tree | 2ec9772d93a2ac68da79ba5812e33b96e85f9587 /usr.sbin/bsdinstall | |
| parent | 4af7a05a16014f016c74f294ecda3f37bba9e3b8 (diff) | |
| download | FreeBSD-src-1920865965040604392f234b2208b526a57ada58.zip FreeBSD-src-1920865965040604392f234b2208b526a57ada58.tar.gz | |
MFC: r319863
bsdinstall: Make ZFS min_auto_ashift adjustment persistent
MFC: r319864
bsdinstall: support Auto ZFS mode for ARM64
Approved by: re (gjb)
Diffstat (limited to 'usr.sbin/bsdinstall')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/auto | 2 | ||||
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 254daa2..42b7422 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -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 diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 9fbf5c9..12bf161 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -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\"' \ |
