From owner-svn-src-head@freebsd.org Wed Jan 15 07:47:53 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5124F223DAA; Wed, 15 Jan 2020 07:47:53 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47yKDn1TZrz4Cg7; Wed, 15 Jan 2020 07:47:53 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 298A831F5; Wed, 15 Jan 2020 07:47:53 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00F7lrvf071098; Wed, 15 Jan 2020 07:47:53 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00F7lqiG071097; Wed, 15 Jan 2020 07:47:52 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <202001150747.00F7lqiG071097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Wed, 15 Jan 2020 07:47:52 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in head/usr.sbin/bsdinstall: . scripts X-SVN-Commit-Revision: 356758 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jan 2020 07:47:53 -0000 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" ;; *)