Date: Wed, 15 Jan 2020 07:47:52 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356758 - in head/usr.sbin/bsdinstall: . scripts Message-ID: <202001150747.00F7lqiG071097@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 (ports committer) Date: Wed Jan 15 07:47:52 2020 New Revision: 356758 URL: https://svnweb.freebsd.org/changeset/base/356758 Log: bsdinstall: Change "default" (first) Partitioning method to ZFS Reported by: Ruben Schade (during his talk at linux.conf.au) Approved by: philip Differential Revision: https://reviews.freebsd.org/D23173 Modified: head/usr.sbin/bsdinstall/bsdinstall.8 head/usr.sbin/bsdinstall/scripts/auto Modified: head/usr.sbin/bsdinstall/bsdinstall.8 ============================================================================== --- head/usr.sbin/bsdinstall/bsdinstall.8 Wed Jan 15 06:18:32 2020 (r356757) +++ head/usr.sbin/bsdinstall/bsdinstall.8 Wed Jan 15 07:47:52 2020 (r356758) @@ -119,7 +119,7 @@ Provides the installer's interactive guided disk parti installations. Defaults to UFS. .It Cm zfsboot -Provides an alternative ZFS-only automatic interactive disk partitioner. +Provides a ZFS-only automatic interactive disk partitioner. Creates a single .Ic zpool with separate datasets for Modified: head/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- head/usr.sbin/bsdinstall/scripts/auto Wed Jan 15 06:18:32 2020 (r356757) +++ head/usr.sbin/bsdinstall/scripts/auto Wed Jan 15 07:47:52 2020 (r356758) @@ -289,7 +289,7 @@ Shell \"Open a shell and partition by hand\"" CURARCH=$( uname -m ) case $CURARCH in amd64|arm64|i386) # Booting ZFS Supported - PMODES="$PMODES \"Auto (ZFS)\" \"Guided Root-on-ZFS\"" + PMODES="\"Auto (ZFS)\" \"Guided Root-on-ZFS\" $PMODES" ;; *) # Booting ZFS Unspported ;; @@ -303,6 +303,10 @@ PARTMODE=`echo $PMODES | xargs dialog --backtitle "Fre exec 3>&- case "$PARTMODE" in +"Auto (ZFS)") # ZFS + bsdinstall zfsboot || error "ZFS setup failed" + bsdinstall mount || error "Failed to mount filesystem" + ;; "Auto (UFS)") # Guided bsdinstall autopart || error "Partitioning error" bsdinstall mount || error "Failed to mount filesystem" @@ -319,10 +323,6 @@ case "$PARTMODE" in else bsdinstall partedit || error "Partitioning error" fi - bsdinstall mount || error "Failed to mount filesystem" - ;; -"Auto (ZFS)") # ZFS - bsdinstall zfsboot || error "ZFS setup failed" bsdinstall mount || error "Failed to mount filesystem" ;; *)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001150747.00F7lqiG071097>