vendor/bsddialog/0.0.1

55 files changed, 0 insertions, 10294 deletions

diff --git a/bsdinstall/Makefile b/bsdinstall/Makefile
deleted file mode 100644
index 88cb691d8dda..000000000000
--- a/bsdinstall/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= distextract distfetch partedit scripts
-SUBDIR_PARALLEL=
-SCRIPTS= bsdinstall
-MAN= bsdinstall.8
-PACKAGE=	bsdinstall
-
-.include <bsd.prog.mk>
diff --git a/bsdinstall/Makefile.depend b/bsdinstall/Makefile.depend
deleted file mode 100644
index f80275d86ab1..000000000000
--- a/bsdinstall/Makefile.depend
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/bsdinstall/Makefile.inc b/bsdinstall/Makefile.inc
deleted file mode 100644
index dc4e35b73799..000000000000
--- a/bsdinstall/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGE=bsdinstall
diff --git a/bsdinstall/README.txt b/bsdinstall/README.txt
deleted file mode 100644
index fadac7318dc2..000000000000
--- a/bsdinstall/README.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-bsdinstall testing
-
-% git clone https://gitlab.com/alfix/bsddialog.git
-% cd bsddialog
-% make
-% cd bsdinstall
-
-You may need to be root to run scripts/utilities:
-
-Script tested:
-
- - time
- - docinstall
- - hardening
- - hostname 
- - mirrorselect
-
-Utilities (Library) tested:
-
- - partedit (sade(8)), in progress
diff --git a/bsdinstall/bsdinstall b/bsdinstall/bsdinstall
deleted file mode 100755
index 1ca03f5c9593..000000000000
--- a/bsdinstall/bsdinstall
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2013 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-# Delay processing of debug flags as the parent until MAIN. export'd to disable
-# re-processing of flags (all children log to the parent's log file).
-#
-export DEBUG_SELF_INITIALIZE=
-export DEBUG_INITIALIZE_FILE=
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-
-############################################################ GLOBALS
-
-: ${TMPDIR:="/tmp"}; export TMPDIR
-
-: ${BSDINSTALL_TMPETC="${TMPDIR}/bsdinstall_etc"}; export BSDINSTALL_TMPETC
-: ${BSDINSTALL_TMPBOOT="${TMPDIR}/bsdinstall_boot"}; export BSDINSTALL_TMPBOOT
-: ${PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"}; export PATH_FSTAB
-: ${BSDINSTALL_DISTDIR="/usr/freebsd-dist"}; export BSDINSTALL_DISTDIR
-: ${BSDINSTALL_CHROOT="/mnt"}; export BSDINSTALL_CHROOT
-
-export debugFile="${debugFile-${BSDINSTALL_LOG-${TMPDIR}/bsdinstall_log}}"
-
-############################################################ MAIN
-
-#
-# Process command-line arguments
-#
-while getopts $GETOPTS_STDARGS ignored; do
-	: just skipping known flags
-done
-shift $(( $OPTIND - 1 ))
-
-# What are we here to do?
-VERB="${1:-auto}"; shift
-
-[ -d "$BSDINSTALL_TMPETC" ] || mkdir -p "$BSDINSTALL_TMPETC"
-[ -d "$BSDINSTALL_TMPBOOT" ] || mkdir -p "$BSDINSTALL_TMPBOOT"
-
-# Only enable debugging if debugFile is non-NULL and can be initialized
-f_quietly f_debug_init
-f_isset debugFile || debug=
-
-f_dprintf "Running installation step: %s %s" "$VERB" "$*"
-if [ "$debug" ]; then
-	case "$debugFile" in
-	# If NULL, send errors to the bit-bucket
-	"") exec "/usr/libexec/bsdinstall/$VERB" "$@" 2> /dev/null ;;
-	# If begins with `+', send errors to both terminal and file (no `+')
-	+*) exec "/usr/libexec/bsdinstall/$VERB" "$@" \
-		2>&1 >&$TERMINAL_STDOUT_PASSTHRU | tee "${debugFile#+}" ;;
-	# Otherwise, just send errors to the file specified
-	*) exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>> "$debugFile"
-	esac
-else
-	exec "/usr/libexec/bsdinstall/$VERB" "$@" 2> /dev/null
-fi
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/bsdinstall.8 b/bsdinstall/bsdinstall.8
deleted file mode 100644
index ee23fb4cecc4..000000000000
--- a/bsdinstall/bsdinstall.8
+++ /dev/null
@@ -1,639 +0,0 @@
-.\"-
-.\" Copyright (c) 2011-2013 Nathan Whitehorn <nwhitehorn@FreeBSD.org> All rights reserved.
-.\" Copyright (c) 2018 Roberto Fernandez Cueto <roberfern@gmail.com>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd March 26, 2021
-.Dt BSDINSTALL 8
-.Os
-.Sh NAME
-.Nm bsdinstall
-.Nd system installer
-.Sh SYNOPSIS
-.Nm
-.Op Ar options
-.Op Ar target
-.Op Ar ...
-.Sh DESCRIPTION
-.Nm
-is used for installation of new systems, both for system setup from
-installation media, e.g., CD-ROMs, and for use on live systems to prepare
-VM images and jails.
-.Pp
-Much like
-.Xr make 1 , Nm
-takes a target and possible parameters of the target as arguments.
-If invoked with no arguments, it will invoke the
-.Cm auto
-target, which provides a standard interactive installation, invoking the
-others in sequence.
-To perform a scripted installation,
-these subtargets can be invoked separately by an installation script.
-.Sh OPTIONS
-.Nm
-supports the following options, global to all targets:
-.Bl -tag -width indent+
-.It Fl D Ar file
-Provide a path for the installation log file
-.Pq overrides Ev BSDINSTALL_LOG .
-See
-.Sx ENVIRONMENT VARIABLES
-for more information on
-.Ev BSDINSTALL_LOG .
-.El
-.Sh TARGETS
-Most of the following targets are only useful for scripting the installer.
-For interactive use, most users will be interested only in the
-.Cm auto ,
-.Cm jail ,
-and
-.Cm script
-targets.
-.Bl -tag -width ".Cm jail Ar destination"
-.It Cm auto
-Run the standard interactive installation, including disk partitioning.
-.It Cm jail Ar destination
-Sets up a new chroot system at
-.Pa destination ,
-suitable for use with
-.Xr jail 8 .
-Behavior is generally similar to
-.Cm auto ,
-except that disk partitioning and network setup are skipped and a kernel is
-not installed into the new system.
-.It Cm script Ar script
-Runs the installation script at
-.Pa script .
-See
-.Sx SCRIPTING
-for more information on this target.
-.It Cm keymap
-If the current controlling TTY is a
-.Xr syscons 4
-or
-.Xr vt 4
-console, asks the user to set the current keymap, and saves the result to the
-new system's
-.Pa rc.conf .
-.It Cm hostname
-Prompts the user for a host name for the new system and saves the result to the
-new system's
-.Pa rc.conf .
-If
-.Ev BSDINSTALL_CONFIGCURRENT
-is set, also sets the host name of the current system.
-.It Cm netconfig
-Interactively configures network interfaces (first invoking
-.Cm wlanconfig
-on wireless interfaces), saving the result to the new system's
-.Pa rc.conf
-and
-.Pa resolv.conf .
-If
-.Ev BSDINSTALL_CONFIGCURRENT
-is set, also configures the network interfaces of the current system to match.
-.It Cm autopart
-Provides the installer's interactive guided disk partitioner for single-disk
-installations.
-Defaults to UFS.
-.It Cm bootconfig
-Detects an appropriate partition and installs UEFI boot loader files.
-.It Cm zfsboot
-Provides a ZFS-only automatic interactive disk partitioner.
-Creates a single
-.Ic zpool
-with separate datasets for
-.Pa /tmp ,
-.Pa /usr ,
-.Pa /usr/home ,
-.Pa /usr/ports ,
-.Pa /usr/src ,
-and
-.Pa /var .
-Optionally can set up
-.Xr geli 8
-to encrypt the disk.
-.It Cm partedit
-Provides the installer's interactive manual disk partitioner with an interface
-identical to
-.Xr sade 8 .
-Supports multiple disks as well as UFS, ZFS, and FAT file systems.
-ZFS is set up with one pool and dataset per partition.
-.It Cm scriptedpart Ar parameters
-Sets up disks like
-.Cm autopart
-and
-.Cm partedit ,
-but non-interactively according to the disk setup specified in
-.Ar parameters .
-Each disk setup is specified by a three-part argument:
-.Pp
-.Ar disk
-.Op Ar scheme
-.Op Ar {partitions}
-.Pp
-Multiple disk setups are separated by semicolons.
-The
-.Ar disk
-argument specifies the disk on which to operate (which will be erased),
-or the special value
-.Em DEFAULT ,
-which will result in either a selection window (as in
-.Cm autopart )
-for the destination disk or, if there is only one possible disk, will
-automatically select it.
-The
-.Ar scheme
-argument specifies the
-.Xr gpart 8
-partition scheme to apply to the disk.
-If
-.Ar scheme
-is unspecified,
-.Cm scriptedpart
-will apply the default bootable scheme on your platform.
-The
-.Ar partitions
-argument is also optional and specifies how to partition
-.Ar disk .
-It consists of a comma-separated list of partitions to create enclosed in
-curly braces.
-Each partition declaration takes the form
-.Pp
-.Ar size
-.Ar type
-.Op Ar mount point
-.Pp
-.Ar size
-specifies the partition size to create in bytes (K, M, and G suffixes
-can be appended to specify kilobytes, megabytes, and gigabytes respectively),
-while the
-.Em auto
-keyword causes the partition to take all the remaining space on the disk.
-The
-.Ar type
-option chooses the
-.Xr gpart 8
-filesystem type, e.g., freebsd-ufs, freebsd-zfs, or freebsd-swap.
-The optional
-.Ar mount point
-argument sets where the created partition is to be mounted in the installed
-system.
-As an example, a typical invocation looks like:
-.Pp
-bsdinstall scriptedpart ada0 { 20G freebsd-ufs /, 4G freebsd-swap, 20G freebsd-ufs /var, auto freebsd-ufs /usr }
-.Pp
-Note that the list of partitions should
-.Em not
-include boot partitions (e.g. EFI system partitions), which will be created automatically on whatever disk includes /.
-.Pp
-A shorter invocation to use the default partitioning (as
-.Cm autopart
-would have used) on the same disk:
-.Pp
-bsdinstall scriptedpart ada0
-.Pp
-or, even shorter:
-.Pp
-bsdinstall scriptedpart DEFAULT
-.It Cm mount
-Mounts the file systems previously configured by
-.Cm autopart ,
-.Cm partedit ,
-or
-.Cm scriptedpart
-under
-.Ev BSDINSTALL_CHROOT .
-.It Cm distfetch
-Fetches the distributions in
-.Ev DISTRIBUTIONS
-to
-.Ev BSDINSTALL_DISTDIR
-from
-.Ev BSDINSTALL_DISTSITE .
-.It Cm checksum
-Verifies the checksums of the distributions listed in
-.Ev DISTRIBUTIONS
-against the distribution manifest.
-.It Cm distextract
-Extracts the distributions listed in
-.Ev DISTRIBUTIONS
-into
-.Ev BSDINSTALL_CHROOT .
-.It Cm rootpass
-Interactively invokes
-.Xr passwd 1
-in the new system to set the root user's password.
-.It Cm adduser
-Interactively invokes
-.Xr adduser 8
-in the new system.
-.It Cm time
-Interactively sets the time, date, and time zone of the new system.
-.It Cm services
-Queries the user for the system daemons to begin at system startup,
-writing the result into the new system's
-.Pa rc.conf .
-.It Cm entropy
-Reads a small amount of data from
-.Pa /dev/random
-and stores it in a file in the new system's root directory.
-.It Cm config
-Installs the configuration files destined for the new system, e.g.,
-.Xr rc.conf 5
-fragments generated by
-.Cm netconfig ,
-etc.) onto the new system.
-.El
-.Sh ENVIRONMENT VARIABLES
-The following environment variables control various aspects of the installation
-process.
-Many are used internally during installation and have reasonable default values
-for most installation scenarios.
-Others are set by various interactive user prompts, and can be usefully
-overridden when making scripted or customized installers.
-.Bl -tag -width ".Ev BSDINSTALL_DISTSITE"
-.It Ev TMPDIR
-The directory to use for temporary files.
-Default:
-.Dq Pa /tmp
-.It Ev DISTRIBUTIONS
-The set of distributions to install, e.g., "base.txz kernel.txz ports.txz".
-Default: unset
-.It Ev PARTITIONS
-The partitioning of the disk onto which the system is being installed.
-See
-.Cm scriptedpart
-of
-the
-.Sx TARGETS
-section for format details. If this variable is unset, the installer will
-use the default partitioning as in
-.Cm autopart .
-Default: unset
-.It Ev BSDINSTALL_DISTDIR
-The directory in which the distribution files can be found (or to which they
-should be downloaded).
-Default:
-.Dq Pa /usr/freebsd-dist
-.It Ev BSDINSTALL_DISTSITE
-URL from which the distribution files should be downloaded if they are not
-already present in the directory defined by
-.Ev BSDINSTALL_DISTDIR .
-This should be a full path to the files, including architecture and release
-names.
-Most targets, e.g.,
-.Cm auto
-and
-.Cm jail ,
-that prompt for a
-.Fx
-mirror will skip that step if this variable is already defined in the
-environment.
-Example:
-.Pa ftp://ftp.freebsd.org/pub/FreeBSD/releases/powerpc/powerpc64/9.1-RELEASE
-.It Ev BSDINSTALL_CHROOT
-The directory into which the distribution files should be unpacked and the
-directory at which the root file system of the new system should be mounted.
-Default:
-.Dq Pa /mnt
-.It Ev BSDINSTALL_LOG
-Path to a log file for the installation.
-Default:
-.Dq Pa $TMPDIR/bsdinstall_log
-.It Ev BSDINSTALL_TMPETC
-Directory where files destined for the new system's
-.Pa /etc
-will be stored until the
-.Cm config
-target is executed.
-If this directory does not already exist, it will be created.
-Default:
-.Dq Pa $TMPDIR/bsdinstall_etc
-.It Ev BSDINSTALL_TMPBOOT
-Directory where files destined for the new system's
-.Pa /boot
-will be stored until the
-.Cm config
-target is executed.
-If this directory does not already exist, it will be created.
-Default:
-.Dq Pa $TMPDIR/bsdinstall_boot
-.It Ev ZFSBOOT_POOL_NAME
-Name for the pool containing the base system.
-Default:
-.Dq zroot
-.It Ev ZFSBOOT_POOL_CREATE_OPTIONS
-Options to be used when creating the base system's pool.
-Each option must be followed by the -O flag to be taken into consideration
-or the pool will not be created due to errors using the command
-.Cm zpool .
-Default:
-.Dq Li "-O compress=lz4 -O atime=off"
-.It Ev ZFSBOOT_BEROOT_NAME
-Name for the boot environment parent dataset.
-This is a non-mountable dataset meant to be a parent dataset where different
-boot environment are going to be created.
-Default:
-.Dq ROOT
-.It Ev ZFSBOOT_BOOTFS_NAME
-Name for the primary boot environment, which will be the default boot
-environment for the system.
-Default:
-.Dq default
-.It Ev ZFSBOOT_VDEV_TYPE
-The type of pool to be created for the base system.
-This variable can take one of this values: stripe (No redundancy),
-mirror (n-Way mirroring), raid10 (RAID 1+0 - n x 2-Way Mirrors),
-raidz1 (RAID-Z1 - Single Redundancy RAID), raidz2 (RAID-Z2 - Double Redundancy RAID)
-or raidz3 (RAID-Z3 Triple Redundancy RAID).
-Default:
-.Dq stripe
-.It Ev ZFSBOOT_FORCE_4K_SECTORS
-Indicates either the pool will use 4K or 512 sectors.
-If this variable is not empty, 4K sectors will be used.
-Default:
-.Dq 1
-.It Ev ZFSBOOT_GELI_ENCRYPTION
-If this variable is not empty, it will use
-.Xr geli 8
-to encrypt the root pool, enabling automatically the
-.Ev ZFSBOOT_BOOT_POOL
-variable.
-Default:
-.Dq ""
-.It Ev ZFSBOOT_GELI_KEY_FILE
-Path to the
-.Xr geli 8
-keyfile used to encrypt the pool where the base system is stored.
-Default:
-.Dq Pa /boot/encryption.key
-.It Ev ZFSBOOT_BOOT_POOL
-If set a separated boot pool will be created for the kernel of the
-system and
-.Xr loader 8 .
-Default: unset
-.It Ev ZFSBOOT_BOOT_POOL_CREATE_OPTIONS
-Options to use when creating the boot pool, when enabled (See
-.Ev ZFSBOOT_BOOT_POOL ).
-Default: unset
-.It Ev ZFSBOOT_BOOT_POOL_NAME
-Name for the optional boot pool when it is enabled, (See
-.Ev ZFSBOOT_BOOT_POOL ).
-Default:
-.Dq bootpool
-.It Ev ZFSBOOT_BOOT_POOL_SIZE
-Size of the boot pool when it is enabled (See
-.Ev ZFSBOOT_BOOT_POOL ).
-Default:
-.Dq 2g
-.It Ev ZFSBOOT_DISKS
-Disks to be used for the base system, including the boot pool.
-This variable must only be used on a scripted installation.
-See
-.Sx SCRIPTING
-for more information.
-Default: unset
-.It Ev ZFSBOOT_SWAP_SIZE
-Size of the swap partition on each block device.
-This variable will be passed to
-.Xr gpart 8 ;
-which supports SI unit suffixes.
-Default:
-.Dq 2g
-.It Ev ZFSBOOT_SWAP_ENCRYPTION
-If set, enables the encryption of the swap partition using
-.Xr geli 8 .
-Default: ""
-.It Ev ZFSBOOT_SWAP_MIRROR
-If set, enables a swap mirroring using
-.Xr gmirror 8 .
-Default:
-unset
-.It Ev ZFSBOOT_DATASETS
-ZFS datasets to be created on the root zpool, it requires the
-following datasets:
-.Pa /tmp ,
-.Pa /var/tmp ,
-.Pa /$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME .
-See
-.Sx ZFS DATASETS
-for more information about who to write this variable and to
-take a look into the default value of it.
-.It Ev ZFSBOOT_CONFIRM_LAYOUT
-If set and the installation is interactive, allow the user to confirm
-the layout before continuing with the installation.
-Default:
-.Dq 1
-.El
-.Sh SCRIPTING
-.Nm
-supports unattended, or minimally-attended, installations using scripting.
-This can be used with either modified physical installation media or with
-.Xr diskless 8
-installations over the network; information on preparing such media can be
-found in
-.Sx BUILDING AUTOMATIC INSTALL MEDIA
-.Pp
-Scripted installations follow an essentially identical path to interactive
-installations, though with some minor feature differences (for example,
-scripted installations do not support fetching of remote distribution files
-since scripted installations normally install the same files and the distributions
-can be added directly to the installation media).
-.Nm
-scripts consist of two parts: a
-.Em preamble
-and a
-.Em setup script .
-The preamble sets up the options for the installation (how to partition the
-disk[s], which distributions to install, etc.) and the optional second part is
-a shell script run under
-.Xr chroot 8
-in the newly installed system before
-.Nm
-exits.
-The two parts are separated by the usual script header (#!), which also sets
-the interpreter for the setup script.
-.Pp
-A typical bsdinstall script, using the default filesystem layout and the UFS
-filesystem, looks like this:
-.Bd -literal -offset indent
-PARTITIONS=DEFAULT
-DISTRIBUTIONS="kernel.txz base.txz"
-
-#!/bin/sh
-sysrc ifconfig_DEFAULT=DHCP
-sysrc sshd_enable=YES
-pkg install puppet
-.Ed
-.Pp
-For a scripted installation involving a ZFS pool spanning multiple disks,
-the script instead looks like this:
-.Bd -literal -offset indent
-DISTRIBUTIONS="kernel.txz base.txz"
-export ZFSBOOT_VDEV_TYPE=stripe
-export ZFSBOOT_DISKS="ada0 ada1"
-export nonInteractive="YES"
-
-#!/bin/sh
-echo "ifconfig_DEFAULT=DHCP" >> /etc/rc.conf
-echo "sshd_enable=YES" >> /etc/rc.conf
-pkg install puppet
-.Ed
-.Pp
-On
-.Fx
-release media, such a script placed at
-.Pa /etc/installerconfig
-will be run at boot time and the system will be rebooted automatically after
-the installation has completed.
-This can be used for unattended network installation of new systems; see
-.Xr diskless 8
-for details.
-.Ss PREAMBLE
-The preamble consists of installer settings.
-These control global installation parameters (see
-.Sx ENVIRONMENT VARIABLES )
-as well as disk partitioning.
-The preamble is interpreted as a
-.Xr sh 1
-script run at the very beginning of the install.
-If more complicated behavior than setting these variables is desired,
-arbitrary commands can be run here to extend the installer.
-In addition to the variables in
-.Sx ENVIRONMENT VARIABLES ,
-in particular
-.Ev DISTRIBUTIONS ,
-the preamble can contain a variable
-.Ev PARTITIONS
-which is passed to the
-.Cm scriptedpart
-target to control disk setup.
-.Pp
-Alternatively,
-to use
-.Cm zfsboot
-instead of
-.Cm partedit ,
-the preamble can contain the variable
-.Ev ZFSBOOT_DATASETS
-instead of
-.Ev PARTITIONS
-(see below).
-If using .Cm zfsboot, the variables
-.Ev ZFSBOOT_DISKS
-and
-.Ev ZFSBOOT_VDEV_TYPE
-must be set to create the pool of disks for the base system.
-Usually, for a mirrored booting disk, this two variables looks like this:
-.Bd -literal -offset indent
-ZFSBOOT_DISKS="ada0 ada1"
-ZFSBOOT_VDEV_TYPE=mirror
-.Ed
-.Pp
-Remember to export all the variables for the
-.Cm zfsboot
-command, otherwise installation will fail.
-.Ss SETUP SCRIPT
-Following the preamble is an optional shell script, beginning with a #!
-declaration.
-This script will be run at the end of the installation process inside a
-.Xr chroot 8
-environment in the newly installed system and can be used to set up
-configuration files, install packages, etc.
-Note that newly configured system services, e.g., networking have not
-been started in the installed system at this time and only installation
-host services are available.
-.Ss ZFS DATASETS
-If using
-.Cm zfsboot
-in an installation script, the
-.Cm zfsboot
-partitioning tool takes the
-.Ev ZFSBOOT_DATASETS
-variable to create the ZFS datasets on the base system.
-This variable definition can become large if the pool contains many datasets.
-The default value of the
-.Ev ZFSBOOT_DATASETS
-is:
-.Bd -literal -offset indent
-# DATASET	OPTIONS (comma or space separated; or both)
-
-# Boot Environment [BE] root and default boot dataset
-/$ZFSBOOT_BEROOT_NAME				mountpoint=none
-/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME	mountpoint=/
-
-# Compress /tmp, allow exec but not setuid
-/tmp		mountpoint=/tmp,exec=on,setuid=off
-
-# Do not mount /usr so that 'base' files go to the BEROOT
-/usr		mountpoint=/usr,canmount=off
-
-# Home directories separated so they are common to all BEs
-/usr/home	# NB: /home is a symlink to /usr/home
-
-# Ports tree
-/usr/ports	setuid=off
-
-# Source tree (compressed)
-/usr/src
-
-# Create /var and friends
-/var		mountpoint=/var,canmount=off
-/var/audit	exec=off,setuid=off
-/var/crash	exec=off,setuid=off
-/var/log	exec=off,setuid=off
-/var/mail	atime=on
-/var/tmp	setuid=off
-.Ed
-.Pp
-The first column is the name of the dataset to be created as part of the
-.Ev ZFSBOOT_POOL_NAME
-pool and the remainder of each line contains the options to be set on each dataset.
-If multiple options are given, they can be separated by either commas or whitespace;
-everything following a pound/hash character is ignored as a comment.
-.Ss BUILDING AUTOMATIC INSTALL MEDIA
-If building automatic install media, use tar to extract a release ISO:
-.Dl mkdir release-media
-.Dl tar xvf -C release-media FreeBSD-13.0-RELEASE-amd64-disc1.iso
-.Pp
-Then place a script as above in
-.Pa etc/installerconfig
-.Pp
-This directory can then be used directly as an NFS root for
-.Xr diskless 8
-installations or it can be rebuilt into an ISO image using the release scripts in
-.Pa /usr/src/release .
-For example, on amd64:
-.Dl sh /usr/src/release/amd64/mkisoimages.sh -b '13_0_RELEASE_AMD64_CD' output.iso release-media
-.Sh HISTORY
-This version of
-.Nm
-first appeared in
-.Fx 9.0 .
-.Sh AUTHORS
-.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
-.An Devin Teske Aq Mt dteske@FreeBSD.org
-.An Allan Jude Aq Mt allanjude@FreeBSD.org
diff --git a/bsdinstall/distextract/Makefile b/bsdinstall/distextract/Makefile
deleted file mode 100644
index 2b7180e28ea0..000000000000
--- a/bsdinstall/distextract/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-BINDIR= ${LIBEXECDIR}/bsdinstall
-PROG=	distextract
-LIBADD=	archive dpv dialog m
-
-MAN=
-
-.include <bsd.prog.mk>
diff --git a/bsdinstall/distextract/Makefile.depend b/bsdinstall/distextract/Makefile.depend
deleted file mode 100644
index 78020ffb2489..000000000000
--- a/bsdinstall/distextract/Makefile.depend
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libdialog \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libarchive \
-	lib/libbz2 \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/libdpv \
-	lib/libexpat \
-	lib/libfigpar \
-	lib/liblzma \
-	lib/libthr \
-	lib/libutil \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	secure/lib/libcrypto \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/bsdinstall/distextract/distextract.c b/bsdinstall/distextract/distextract.c
deleted file mode 100644
index 8ad6c7b2c64b..000000000000
--- a/bsdinstall/distextract/distextract.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * Copyright (c) 2014 Devin Teske <dteske@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <archive.h>
-#include <ctype.h>
-#include <dialog.h>
-#include <dpv.h>
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Data to process */
-static char *distdir = NULL;
-static struct archive *archive = NULL;
-static struct dpv_file_node *dists = NULL;
-
-/* Function prototypes */
-static void	sig_int(int sig);
-static int	count_files(const char *file);
-static int	extract_files(struct dpv_file_node *file, int out);
-
-#define _errx(...) (end_dialog(), errx(__VA_ARGS__))
-
-int
-main(void)
-{
-	char *chrootdir;
-	char *distributions;
-	int retval;
-	size_t config_size = sizeof(struct dpv_config);
-	size_t file_node_size = sizeof(struct dpv_file_node);
-	size_t span;
-	struct dpv_config *config;
-	struct dpv_file_node *dist = dists;
-	static char backtitle[] = "FreeBSD Installer";
-	static char title[] = "Archive Extraction";
-	static char aprompt[] = "\n  Overall Progress:";
-	static char pprompt[] = "Extracting distribution files...\n";
-	struct sigaction act;
-	char error[PATH_MAX + 512];
-
-	if ((distributions = getenv("DISTRIBUTIONS")) == NULL)
-		errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set");
-	if ((distdir = getenv("BSDINSTALL_DISTDIR")) == NULL)
-		distdir = __DECONST(char *, "");
-
-	/* Initialize dialog(3) */
-	init_dialog(stdin, stdout);
-	dialog_vars.backtitle = backtitle;
-	dlg_put_backtitle();
-
-	dialog_msgbox("",
-	    "Checking distribution archives.\nPlease wait...", 4, 35, FALSE);
-
-	/*
-	 * Parse $DISTRIBUTIONS into dpv(3) linked-list
-	 */
-	while (*distributions != '\0') {
-		span = strcspn(distributions, "\t\n\v\f\r ");
-		if (span < 1) { /* currently on whitespace */
-			distributions++;
-			continue;
-		}
-
-		/* Allocate a new struct for the distribution */
-		if (dist == NULL) {
-			if ((dist = calloc(1, file_node_size)) == NULL)
-				_errx(EXIT_FAILURE, "Out of memory!");
-			dists = dist;
-		} else {
-			dist->next = calloc(1, file_node_size);
-			if (dist->next == NULL)
-				_errx(EXIT_FAILURE, "Out of memory!");
-			dist = dist->next;
-		}
-
-		/* Set path */
-		if ((dist->path = malloc(span + 1)) == NULL)
-			_errx(EXIT_FAILURE, "Out of memory!");
-		snprintf(dist->path, span + 1, "%s", distributions);
-		dist->path[span] = '\0';
-
-		/* Set display name */
-		dist->name = strrchr(dist->path, '/');
-		if (dist->name == NULL)
-			dist->name = dist->path;
-
-		/* Set initial length in files (-1 == error) */
-		dist->length = count_files(dist->path);
-		if (dist->length < 0) {
-			end_dialog();
-			return (EXIT_FAILURE);
-		}
-
-		distributions += span;
-	}
-
-	/* Optionally chdir(2) into $BSDINSTALL_CHROOT */
-	chrootdir = getenv("BSDINSTALL_CHROOT");
-	if (chrootdir != NULL && chdir(chrootdir) != 0) {
-		snprintf(error, sizeof(error),
-		    "Could not change to directory %s: %s\n",
-		    chrootdir, strerror(errno));
-		dialog_msgbox("Error", error, 0, 0, TRUE);
-		end_dialog();
-		return (EXIT_FAILURE);
-	}
-
-	/* Set cleanup routine for Ctrl-C action */
-	act.sa_handler = sig_int;
-	sigaction(SIGINT, &act, 0);
-
-	/*
-	 * Hand off to dpv(3)
-	 */
-	if ((config = calloc(1, config_size)) == NULL)
-		_errx(EXIT_FAILURE, "Out of memory!");
-	config->backtitle	= backtitle;
-	config->title		= title;
-	config->pprompt		= pprompt;
-	config->aprompt		= aprompt;
-	config->options		|= DPV_WIDE_MODE;
-	config->label_size	= -1;
-	config->action		= extract_files;
-	config->status_solo	=
-	    "%10lli files read @ %'9.1f files/sec.";
-	config->status_many	= 
-	    "%10lli files read @ %'9.1f files/sec. [%i/%i busy/wait]";
-	end_dialog();
-	retval = dpv(config, dists);
-
-	dpv_free();
-	while ((dist = dists) != NULL) {
-		dists = dist->next;
-		if (dist->path != NULL)
-			free(dist->path);
-		free(dist);
-	}
-
-	return (retval);
-}
-
-static void
-sig_int(int sig __unused)
-{
-	dpv_interrupt = TRUE;
-}
-
-/*
- * Returns number of files in archive file. Parses $BSDINSTALL_DISTDIR/MANIFEST
- * if it exists, otherwise uses archive(3) to read the archive file.
- */
-static int
-count_files(const char *file)
-{
-	static FILE *manifest = NULL;
-	char *p;
-	int file_count;
-	int retval;
-	size_t span;
-	struct archive_entry *entry;
-	char line[512];
-	char path[PATH_MAX];
-	char errormsg[PATH_MAX + 512];
-
-	if (manifest == NULL) {
-		snprintf(path, sizeof(path), "%s/MANIFEST", distdir);
-		manifest = fopen(path, "r");
-	}
-
-	if (manifest != NULL) {
-		rewind(manifest);
-		while (fgets(line, sizeof(line), manifest) != NULL) {
-			p = &line[0];
-			span = strcspn(p, "\t") ;
-			if (span < 1 || strncmp(p, file, span) != 0)
-				continue;
-
-			/*
-			 * We're at the right manifest line. The file count is
-			 * in the third element
-			 */
-			span = strcspn(p += span + (*p != '\0' ? 1 : 0), "\t");
-			span = strcspn(p += span + (*p != '\0' ? 1 : 0), "\t");
-			if (span > 0) {
-				file_count = (int)strtol(p, (char **)NULL, 10);
-				if (file_count == 0 && errno == EINVAL)
-					continue;
-				return (file_count);
-			}
-		}
-	}
-
-	/*
-	 * Either no manifest, or manifest didn't mention this archive.
-	 * Use archive(3) to read the archive, counting files within.
-	 */
-	if ((archive = archive_read_new()) == NULL) {
-		snprintf(errormsg, sizeof(errormsg),
-		    "Error: %s\n", archive_error_string(NULL));
-		dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
-		return (-1);
-	}
-	archive_read_support_format_all(archive);
-	archive_read_support_filter_all(archive);
-	snprintf(path, sizeof(path), "%s/%s", distdir, file);
-	retval = archive_read_open_filename(archive, path, 4096);
-	if (retval != ARCHIVE_OK) {
-		snprintf(errormsg, sizeof(errormsg),
-		    "Error while extracting %s: %s\n", file,
-		    archive_error_string(archive));
-		dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
-		archive = NULL;
-		return (-1);
-	}
-
-	file_count = 0;
-	while (archive_read_next_header(archive, &entry) == ARCHIVE_OK)
-		file_count++;
-	archive_read_free(archive);
-	archive = NULL;
-
-	return (file_count);
-}
-
-static int
-extract_files(struct dpv_file_node *file, int out __unused)
-{
-	int retval;
-	struct archive_entry *entry;
-	char path[PATH_MAX];
-	char errormsg[PATH_MAX + 512];
-
-	/* Open the archive if necessary */
-	if (archive == NULL) {
-		if ((archive = archive_read_new()) == NULL) {
-			snprintf(errormsg, sizeof(errormsg),
-			    "Error: %s\n", archive_error_string(NULL));
-			dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
-			dpv_abort = 1;
-			return (-1);
-		}
-		archive_read_support_format_all(archive);
-		archive_read_support_filter_all(archive);
-		snprintf(path, sizeof(path), "%s/%s", distdir, file->path);
-		retval = archive_read_open_filename(archive, path, 4096);
-		if (retval != 0) {
-			snprintf(errormsg, sizeof(errormsg),
-			    "Error opening %s: %s\n", file->name,
-			    archive_error_string(archive));
-			dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
-			file->status = DPV_STATUS_FAILED;
-			dpv_abort = 1;
-			return (-1);
-		}
-	}
-
-	/* Read the next archive header */
-	retval = archive_read_next_header(archive, &entry);
-
-	/* If that went well, perform the extraction */
-	if (retval == ARCHIVE_OK)
-		retval = archive_read_extract(archive, entry,
-		    ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_OWNER |
-		    ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_ACL |
-		    ARCHIVE_EXTRACT_XATTR | ARCHIVE_EXTRACT_FFLAGS);
-
-	/* Test for either EOF or error */
-	if (retval == ARCHIVE_EOF) {
-		archive_read_free(archive);
-		archive = NULL;
-		file->status = DPV_STATUS_DONE;
-		return (100);
-	} else if (retval != ARCHIVE_OK &&
-	    !(retval == ARCHIVE_WARN &&
-	    strcmp(archive_error_string(archive), "Can't restore time") == 0)) {
-		/*
-		 * Print any warning/error messages except inability to set
-		 * ctime/mtime, which is not fatal, or even interesting,
-		 * for our purposes. Would be nice if this were a libarchive
-		 * option.
-		 */
-		snprintf(errormsg, sizeof(errormsg),
-		    "Error while extracting %s: %s\n", file->name,
-		    archive_error_string(archive));
-		dialog_msgbox("Extract Error", errormsg, 0, 0, TRUE);
-		file->status = DPV_STATUS_FAILED;
-		dpv_abort = 1;
-		return (-1);
-	}
-
-	dpv_overall_read++;
-	file->read++;
-
-	/* Calculate [overall] percentage of completion (if possible) */
-	if (file->length >= 0)
-		return (file->read * 100 / file->length);
-	else
-		return (-1);
-}
diff --git a/bsdinstall/distfetch/Makefile b/bsdinstall/distfetch/Makefile
deleted file mode 100644
index 70ecb381d485..000000000000
--- a/bsdinstall/distfetch/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-BINDIR= ${LIBEXECDIR}/bsdinstall
-PROG=	distfetch
-LIBADD=	fetch dialog m
-
-MAN=
-
-.include <bsd.prog.mk>
diff --git a/bsdinstall/distfetch/Makefile.depend b/bsdinstall/distfetch/Makefile.depend
deleted file mode 100644
index c1195d955ced..000000000000
--- a/bsdinstall/distfetch/Makefile.depend
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libdialog \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/libfetch \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	secure/lib/libcrypto \
-	secure/lib/libssl \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/bsdinstall/distfetch/distfetch.c b/bsdinstall/distfetch/distfetch.c
deleted file mode 100644
index 5f262343720e..000000000000
--- a/bsdinstall/distfetch/distfetch.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * Copyright (c) 2014 Devin Teske <dteske@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <ctype.h>
-#include <err.h>
-#include <dialog.h>
-#include <errno.h>
-#include <fetch.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static int fetch_files(int nfiles, char **urls);
-
-int
-main(void)
-{
-	char *diststring;
-	char **urls;
-	int i;
-	int ndists = 0;
-	int nfetched;
-	char error[PATH_MAX + 512];
-
-	if (getenv("DISTRIBUTIONS") == NULL)
-		errx(EXIT_FAILURE, "DISTRIBUTIONS variable is not set");
-
-	diststring = strdup(getenv("DISTRIBUTIONS"));
-	for (i = 0; diststring[i] != 0; i++)
-		if (isspace(diststring[i]) && !isspace(diststring[i+1]))
-			ndists++;
-	ndists++; /* Last one */
-
-	urls = calloc(ndists, sizeof(const char *));
-	if (urls == NULL) {
-		free(diststring);
-		errx(EXIT_FAILURE, "Out of memory!");
-	}
-
-	init_dialog(stdin, stdout);
-	dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer");
-	dlg_put_backtitle();
-
-	for (i = 0; i < ndists; i++) {
-		urls[i] = malloc(PATH_MAX);
-		snprintf(urls[i], PATH_MAX, "%s/%s",
-		    getenv("BSDINSTALL_DISTSITE"), strsep(&diststring, " \t"));
-	}
-
-	if (chdir(getenv("BSDINSTALL_DISTDIR")) != 0) {
-		snprintf(error, sizeof(error),
-		    "Could not change to directory %s: %s\n",
-		    getenv("BSDINSTALL_DISTDIR"), strerror(errno));
-		dialog_msgbox("Error", error, 0, 0, TRUE);
-		end_dialog();
-		return (EXIT_FAILURE);
-	}
-
-	nfetched = fetch_files(ndists, urls);
-
-	end_dialog();
-
-	free(diststring);
-	for (i = 0; i < ndists; i++) 
-		free(urls[i]);
-	free(urls);
-
-	return ((nfetched == ndists) ? EXIT_SUCCESS : EXIT_FAILURE);
-}
-
-static int
-fetch_files(int nfiles, char **urls)
-{
-	FILE *fetch_out;
-	FILE *file_out;
-	const char **items;
-	int i;
-	int last_progress;
-	int nsuccess = 0; /* Number of files successfully downloaded */
-	int progress = 0;
-	size_t chunk;
-	off_t current_bytes;
-	off_t fsize;
-	off_t total_bytes;
-	char status[8];
-	struct url_stat ustat;
-	char errormsg[PATH_MAX + 512];
-	uint8_t block[4096];
-
-	/* Make the transfer list for dialog */
-	items = calloc(sizeof(char *), nfiles * 2);
-	if (items == NULL)
-		errx(EXIT_FAILURE, "Out of memory!");
-
-	for (i = 0; i < nfiles; i++) {
-		items[i*2] = strrchr(urls[i], '/');
-		if (items[i*2] != NULL)
-			items[i*2]++;
-		else
-			items[i*2] = urls[i];
-		items[i*2 + 1] = "Pending";
-	}
-
-	dialog_msgbox("", "Connecting to server.\nPlease wait...", 0, 0, FALSE);
-
-	/* Try to stat all the files */
-	total_bytes = 0;
-	for (i = 0; i < nfiles; i++) {
-		if (fetchStatURL(urls[i], &ustat, "") == 0 && ustat.size > 0)
-			total_bytes += ustat.size;
-	}
-
-	current_bytes = 0;
-	for (i = 0; i < nfiles; i++) {
-		last_progress = progress;
-		if (total_bytes == 0)
-			progress = (i*100)/nfiles;
-
-		fetchLastErrCode = 0;
-		fetch_out = fetchXGetURL(urls[i], &ustat, "");
-		if (fetch_out == NULL) {
-			snprintf(errormsg, sizeof(errormsg),
-			    "Error while fetching %s: %s\n", urls[i],
-			    fetchLastErrString);
-			items[i*2 + 1] = "Failed";
-			dialog_msgbox("Fetch Error", errormsg, 0, 0,
-			    TRUE);
-			continue;
-		}
-
-		items[i*2 + 1] = "In Progress";
-		fsize = 0;
-		file_out = fopen(items[i*2], "w+");
-		if (file_out == NULL) {
-			snprintf(errormsg, sizeof(errormsg),
-			    "Error while fetching %s: %s\n",
-			    urls[i], strerror(errno));
-			items[i*2 + 1] = "Failed";
-			dialog_msgbox("Fetch Error", errormsg, 0, 0,
-			    TRUE);
-			fclose(fetch_out);
-			continue;
-		}
-
-		while ((chunk = fread(block, 1, sizeof(block), fetch_out))
-		    > 0) {
-			if (fwrite(block, 1, chunk, file_out) < chunk)
-				break;
-
-			current_bytes += chunk;
-			fsize += chunk;
-	
-			if (total_bytes > 0) {
-				last_progress = progress;
-				progress = (current_bytes*100)/total_bytes; 
-			}
-
-			if (ustat.size > 0) {
-				snprintf(status, sizeof(status), "-%jd",
-				    (fsize*100)/ustat.size);
-				items[i*2 + 1] = status;
-			}
-
-			if (progress > last_progress)
-				dialog_mixedgauge("Fetching Distribution",
-				    "Fetching distribution files...", 0, 0,
-				    progress, nfiles,
-				    __DECONST(char **, items));
-		}
-
-		if (ustat.size > 0 && fsize < ustat.size) {
-			if (fetchLastErrCode == 0) 
-				snprintf(errormsg, sizeof(errormsg),
-				    "Error while fetching %s: %s\n",
-				    urls[i], strerror(errno));
-			else
-				snprintf(errormsg, sizeof(errormsg),
-				    "Error while fetching %s: %s\n",
-				    urls[i], fetchLastErrString);
-			items[i*2 + 1] = "Failed";
-			dialog_msgbox("Fetch Error", errormsg, 0, 0,
-				    TRUE);
-		} else {
-			items[i*2 + 1] = "Done";
-			nsuccess++;
-		}
-
-		fclose(fetch_out);
-		fclose(file_out);
-	}
-
-	free(items);
-	return (nsuccess);
-}
diff --git a/bsdinstall/partedit/Makefile b/bsdinstall/partedit/Makefile
deleted file mode 100644
index e63840cbb9dc..000000000000
--- a/bsdinstall/partedit/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Any copyright is dedicated to the Public Domain, see:
-#     <http://creativecommons.org/publicdomain/zero/1.0/>
-#
-# Written by Alfonso Sabato Siciliano
-
-OUTPUT=  sade
-# arch: partedit_powerpc.c partedit_efi.c partedit_generic.c diskeditor.c
-SOURCES= diskmenu.c gpart_ops.c part_wizard.c  partedit_x86.c partedit.c \
-	 scripted.c 
-OBJECTS= ${SOURCES:.c=.o}
-#LIBPATH= ${.CURDIR}../../../lib
-LIBPATH= ../../lib
-LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so
-
-CFLAGS= -Wall -I${LIBPATH}
-LDFLAGS= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog -lgeom -lncursesw -lutil -ldialog -lm
-
-BINDIR= /usr/local/bin
-MAN= ${OUTPUT}.1
-GZIP= gzip -cn
-MANDIR= /usr/local/share/man/man1
-
-INSTALL= install
-RM= rm -f
-
-all : ${OUTPUT}
-
-${OUTPUT}: ${LIBBSDDIALOG} ${OBJECTS}
-	${CC} ${LDFLAGS} ${OBJECTS} -o ${.PREFIX}
-
-${LIBBSDDIALOG}:
-.if defined(PORTNCURSES)
-	make -C ${LIBPATH} -DPORTNCURSES
-.else
-	make -C ${LIBPATH}
-.endif
-
-.c.o:
-	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-
-install:
-	${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR}
-	${GZIP} ${MAN} > ${MAN}.gz
-	${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
-
-unistall:
-	${RM} ${BINDIR}/${OUTPUT}
-	${RM} ${MANDIR}/${MAN}.gz
-
-clean:
-	make -C ${LIBPATH} clean
-	${RM} ${OUTPUT} *.o *~ *.core ${MAN}.gz
diff --git a/bsdinstall/partedit/Makefile.depend b/bsdinstall/partedit/Makefile.depend
deleted file mode 100644
index 2c3bc47c6d42..000000000000
--- a/bsdinstall/partedit/Makefile.depend
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libdialog \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/libexpat \
-	lib/libgeom \
-	lib/libsbuf \
-	lib/libutil \
-	lib/msun \
-	lib/ncurses/ncursesw \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/bsdinstall/partedit/Makefile_ORIG b/bsdinstall/partedit/Makefile_ORIG
deleted file mode 100644
index a250302a1962..000000000000
--- a/bsdinstall/partedit/Makefile_ORIG
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-BINDIR= ${LIBEXECDIR}/bsdinstall
-PROG=	partedit
-LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
-       ${BINDIR}/partedit ${BINDIR}/scriptedpart
-SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade
-LIBADD+=	geom ncursesw util dialog m
-
-PARTEDIT_ARCH= ${MACHINE}
-.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
-PARTEDIT_ARCH= x86
-.elif ${MACHINE} == "arm64" || ${MACHINE} == "riscv"
-PARTEDIT_ARCH= efi
-.endif
-.if !exists(partedit_${PARTEDIT_ARCH}.c)
-PARTEDIT_ARCH= generic
-.endif
-
-SRCS=	diskeditor.c partedit.c gpart_ops.c partedit_${PARTEDIT_ARCH}.c \
-	part_wizard.c scripted.c
-
-WARNS?=	3
-MAN= sade.8
-
-.include <bsd.prog.mk>
diff --git a/bsdinstall/partedit/diskeditor.c b/bsdinstall/partedit/diskeditor.c
deleted file mode 100644
index 1679def32a19..000000000000
--- a/bsdinstall/partedit/diskeditor.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <libutil.h>
-#include <dialog.h>
-#include <dlg_keys.h>
-
-#include "diskeditor.h"
-
-static void
-print_partedit_item(WINDOW *partitions, struct partedit_item *items,
-    int item, int nscroll, int selected)
-{
-	chtype attr = A_NORMAL;
-	char sizetext[16];
-	int y = item - nscroll + 1;
-
-	wattrset(partitions, selected ? item_selected_attr : item_attr);
-	wmove(partitions, y, MARGIN + items[item].indentation*2);
-	dlg_print_text(partitions, items[item].name, 10, &attr);
-	wmove(partitions, y, 17);
-	wattrset(partitions, item_attr);
-
-	humanize_number(sizetext, 7, items[item].size, "B", HN_AUTOSCALE,
-	    HN_DECIMAL);
-	dlg_print_text(partitions, sizetext, 8, &attr);
-	wmove(partitions, y, 25);
-	dlg_print_text(partitions, items[item].type, 15, &attr);
-	wmove(partitions, y, 40);
-	if (items[item].mountpoint != NULL)
-		dlg_print_text(partitions, items[item].mountpoint, 8, &attr);
-}
-
-int
-diskeditor_show(const char *title, const char *cprompt,
-    struct partedit_item *items, int nitems, int *selected, int *nscroll)
-{
-	WINDOW *dialog, *partitions;
-	char *prompt;
-	const char *buttons[] =
-	    { "Create", "Delete", "Modify", "Revert", "Auto", "Finish", NULL };
-	const char *help_text[] = {
-	    "Add a new partition", "Delete selected partition or partitions",
-	    "Change partition type or mountpoint",
-	    "Revert changes to disk setup", "Use guided partitioning tool",
-	    "Exit partitioner (will ask whether to save changes)", NULL };
-	int x, y;
-	int i;
-	int height, width, min_width;
-	int partlist_height, partlist_width;
-	int cur_scroll = 0;
-	int key, fkey;
-	int cur_button = 5, cur_part = 0;
-	int result = DLG_EXIT_UNKNOWN;
-
-	static DLG_KEYS_BINDING binding[] = {
-		ENTERKEY_BINDINGS,
-		DLG_KEYS_DATA( DLGK_ENTER,      ' ' ),
-		DLG_KEYS_DATA( DLGK_ITEM_NEXT, KEY_DOWN ),
-		DLG_KEYS_DATA( DLGK_ITEM_PREV, KEY_UP ),
-		DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
-		DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
-		DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
-		DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
-
-		SCROLLKEY_BINDINGS,
-		END_KEYS_BINDING
-	};
-
-	static DLG_KEYS_BINDING binding2[] = {
-		INPUTSTR_BINDINGS,
-		ENTERKEY_BINDINGS,
-		DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
-		DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
-		DLG_KEYS_DATA( DLGK_ITEM_NEXT,  CHR_NEXT ),
-		DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_DOWN ),
-		DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_NEXT ),
-		DLG_KEYS_DATA( DLGK_ITEM_PREV,  CHR_PREVIOUS ),
-		DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_PREVIOUS ),
-		DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_UP ),
-		DLG_KEYS_DATA( DLGK_PAGE_NEXT,  KEY_NPAGE ),
-		DLG_KEYS_DATA( DLGK_PAGE_PREV,  KEY_PPAGE ),
-		END_KEYS_BINDING
-	};
-
-	/*
-	 * Set up editor window.
-	 */
-	prompt = dlg_strclone(cprompt);
-
-	min_width = 50;
-	height = width = 0;
-	partlist_height = 10;
-	dlg_tab_correct_str(prompt);
-	dlg_button_layout(buttons, &min_width);
-	dlg_auto_size(title, prompt, &height, &width, 2, min_width);
-	height += partlist_height;
-	partlist_width = width - 2*MARGIN;
-	dlg_print_size(height, width);
-	dlg_ctl_size(height, width);
-
-	x = dlg_box_x_ordinate(width);
-	y = dlg_box_y_ordinate(height);
-
-	dialog = dlg_new_window(height, width, y, x);
-	dlg_register_window(dialog, "diskeditorbox", binding);
-	dlg_register_buttons(dialog, "diskeditorbox", buttons);
-
-	dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
-	dlg_draw_bottom_box(dialog);
-	dlg_draw_title(dialog, title);
-	wattrset(dialog, dialog_attr);
-
-	/* Partition list sub-window */
-	partitions = dlg_sub_window(dialog, partlist_height, partlist_width,
-	    y + 3, x + 1);
-	dlg_register_window(partitions, "partlist", binding2);
-	dlg_register_buttons(partitions, "partlist", buttons);
-	wattrset(partitions, menubox_attr);
-
-	dlg_item_help(help_text[cur_button]);
-	dlg_draw_buttons(dialog, height - 2*MARGIN, 0, buttons,
-	    cur_button, FALSE, width);
-	dlg_print_autowrap(dialog, prompt, height, width);
-
-	if (selected != NULL)
-		cur_part = *selected;
-	if (nscroll != NULL)
-		cur_scroll = *nscroll;
-	if (cur_part - cur_scroll >= partlist_height - 2 ||
-	    cur_part - cur_scroll < 0)
-		cur_scroll = cur_part;
-
-repaint:
-	dlg_draw_box(dialog, 3, 1,  partlist_height, partlist_width,
-	    menubox_border_attr, menubox_attr);
-	for (i = cur_scroll; i < MIN(cur_scroll + partlist_height - 2, nitems);
-	    i++)
-		print_partedit_item(partitions, items, i, cur_scroll,
-		    i == cur_part);
-	if (nitems > partlist_height - 2)
-		dlg_draw_arrows(partitions, cur_scroll > 0,
-		    nitems > cur_scroll + partlist_height - 2,
-		    partlist_width - 5, 0, partlist_height - 1);
-	wrefresh(partitions);
-
-	while (result == DLG_EXIT_UNKNOWN) {
-		key = dlg_mouse_wgetch(dialog, &fkey);
-		if ((i = dlg_char_to_button(key, buttons)) >= 0) {
-			cur_button = i;
-			dlg_item_help(help_text[cur_button]);
-			dlg_draw_buttons(dialog, height - 2*MARGIN, 0, buttons,
-			    cur_button, FALSE, width);
-			break;
-		}
-
-		if (!fkey)
-			continue;
-
-		switch (key) {
-		case DLGK_FIELD_NEXT:
-			cur_button = dlg_next_button(buttons, cur_button);
-			if (cur_button < 0)
-				cur_button = 0;
-			dlg_item_help(help_text[cur_button]);
-			dlg_draw_buttons(dialog, height - 2*MARGIN, 0, buttons,
-			    cur_button, FALSE, width);
-			break;
-		case DLGK_FIELD_PREV:
-			cur_button = dlg_prev_button(buttons, cur_button);
-			if (cur_button < 0)
-				cur_button = 0;
-			dlg_item_help(help_text[cur_button]);
-			dlg_draw_buttons(dialog, height - 2*MARGIN, 0, buttons,
-			    cur_button, FALSE, width);
-			break;
-		case DLGK_ITEM_NEXT:
-			if (cur_part == nitems - 1)
-				break; /* End of list */
-
-			/* Deselect old item */
-			print_partedit_item(partitions, items, cur_part,
-			    cur_scroll, 0);
-			/* Select new item */
-			cur_part++;
-			if (cur_part - cur_scroll >= partlist_height - 2) {
-				cur_scroll = cur_part;
-				goto repaint;
-			}
-			print_partedit_item(partitions, items, cur_part,
-			    cur_scroll, 1);
-			wrefresh(partitions);
-			break;
-		case DLGK_ITEM_PREV:
-			if (cur_part == 0)
-				break; /* Start of list */
-
-			/* Deselect old item */
-			print_partedit_item(partitions, items, cur_part,
-			    cur_scroll, 0);
-			/* Select new item */
-			cur_part--;
-			if (cur_part - cur_scroll < 0) {
-				cur_scroll = cur_part;
-				goto repaint;
-			}
-			print_partedit_item(partitions, items, cur_part,
-			    cur_scroll, 1);
-			wrefresh(partitions);
-			break;
-		case DLGK_PAGE_NEXT:
-			cur_scroll += (partlist_height - 2);
-			if (cur_scroll + partlist_height - 2 >= nitems)
-				cur_scroll = nitems - (partlist_height - 2);
-			if (cur_scroll < 0)
-				cur_scroll = 0;
-			if (cur_part < cur_scroll)
-				cur_part = cur_scroll;
-			goto repaint;
-		case DLGK_PAGE_PREV:
-			cur_scroll -= (partlist_height - 2);
-			if (cur_scroll < 0)
-				cur_scroll = 0;
-			if (cur_part >= cur_scroll + partlist_height - 2)
-				cur_part = cur_scroll;
-			goto repaint;
-		case DLGK_PAGE_FIRST:
-			cur_scroll = 0;
-			cur_part = cur_scroll;
-			goto repaint;
-		case DLGK_PAGE_LAST:
-			cur_scroll = nitems - (partlist_height - 2);
-			if (cur_scroll < 0)
-				cur_scroll = 0;
-			cur_part = cur_scroll;
-			goto repaint;
-		case DLGK_ENTER:
-			goto done;
-		default:
-			if (is_DLGK_MOUSE(key)) {
-				cur_button = key - M_EVENT;
-				dlg_item_help(help_text[cur_button]);
-				dlg_draw_buttons(dialog, height - 2*MARGIN, 0,
-				    buttons, cur_button, FALSE, width);
-				goto done;
-			}
-			break;
-		}
-	}
-
-done:
-	if (selected != NULL)
-		*selected = cur_part;
-	if (nscroll != NULL)
-		*nscroll = cur_scroll;
-
-	dlg_del_window(partitions);
-	dlg_del_window(dialog);
-	dlg_mouse_free_regions();
-
-	return (cur_button);
-}
-
diff --git a/bsdinstall/partedit/diskeditor.h b/bsdinstall/partedit/diskeditor.h
deleted file mode 100644
index 186dc3146ced..000000000000
--- a/bsdinstall/partedit/diskeditor.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _PARTEDIT_DISKEDITOR_H
-#define _PARTEDIT_DISKEDITOR_H
-
-#include <inttypes.h>
-
-struct partedit_item {
-	int indentation;
-	const char *name;
-	intmax_t size;
-	const char *type;
-	char *mountpoint;
-
-	void *cookie;
-};
-
-int diskeditor_show(const char *title, const char *prompt,
-    struct partedit_item *items, int nitems, int *selected, int *scroll);
-
-#endif
diff --git a/bsdinstall/partedit/diskmenu.c b/bsdinstall/partedit/diskmenu.c
deleted file mode 100644
index fe8ecb92b264..000000000000
--- a/bsdinstall/partedit/diskmenu.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2021 Alfonso Sabato Siciliano
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <bsddialog.h>
-#include <stdio.h>
-#include <libutil.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "diskmenu.h"
-
-int
-diskmenu_show(const char *title, const char *text, struct partedit_item *items,
-    int nitems, int *selected)
-{
-	int i, output;
-	struct bsddialog_conf conf;
-	struct bsddialog_menuitem *bsditems;
-	char desc[1024], *mp, size[16];
-
-	bsditems = malloc(nitems * sizeof(struct bsddialog_menuitem));
-	if (bsditems == NULL)
-		return BSDDIALOG_ERROR;
-	for (i=0; i<nitems; i++) {
-		bsditems[i].prefix = "";
-		bsditems[i].depth = items[i].indentation;
-		bsditems[i].name = __DECONST(char *, items[i].name);
-		humanize_number(size, 7, items[i].size, "B",
-		    HN_AUTOSCALE, HN_DECIMAL);
-		mp = items[i].mountpoint != NULL ? items[i].mountpoint : "";
-		snprintf(desc, 1024, "%s %-15s %-10s",
-		    size, items[i].type, mp);
-		bsditems[i].desc = strdup(desc);
-		bsditems[i].bottomdesc = "";
-		bsditems[i].on = false;
-	}
-
-	bsddialog_initconf(&conf);
-	conf.title = __DECONST(char *, title);
-	conf.menu.align_left = true;
-	/*
-	 * libbsddialog does not provides bottom description for buttons.
-	 * "Add a new partition", "Delete selected partition or partitions",
-	 * "Change partition type or mountpoint",
-	 * "Revert changes to disk setup", "Use guided partitioning tool",
-	 * "Exit partitioner (will ask whether to save changes)",
-	 */
-	conf.button.ok_label       = "Create";	
-	conf.button.extra_button   = true;
-	conf.button.extra_label    = "Delete";
-	conf.button.no_label       = "Modify";
-	conf.button.help_button    = true;
-	conf.button.help_label     = "Revert";
-	conf.button.generic1_label = "Auto";
-	conf.button.generic2_label = "Finish";
-	conf.button.default_label  = "Finish";
-	
-	if (bsddialog_init() == BSDDIALOG_ERROR)
-		return BSDDIALOG_ERROR;
-
-	output = bsddialog_menu(&conf, __DECONST(char *, text), 20, 0, 10,
-	    nitems, bsditems, NULL);
-	bsddialog_end();
-
-	for (i=0; i<nitems; i++){
-		if (bsditems[i].on == true) {
-			*selected = i;
-			break;
-		}
-	}
-
-	free(bsditems);
-	
-	return output;
-}
diff --git a/bsdinstall/partedit/diskmenu.h b/bsdinstall/partedit/diskmenu.h
deleted file mode 100644
index 37b4b3b70c0e..000000000000
--- a/bsdinstall/partedit/diskmenu.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _PARTEDIT_DISKEDITOR_H
-#define _PARTEDIT_DISKEDITOR_H
-
-#include <inttypes.h>
-
-
-#define BUTTONCREATE BSDDIALOG_YESOK
-#define BUTTONDELETE BSDDIALOG_EXTRA
-#define BUTTONMODIFY BSDDIALOG_NOCANCEL
-#define BUTTONREVERT BSDDIALOG_HELP
-#define BUTTONAUTO   BSDDIALOG_GENERIC1
-#define BUTTONFINISH BSDDIALOG_GENERIC2
-
-
-struct partedit_item {
-	int indentation;
-	const char *name;
-	intmax_t size;
-	const char *type;
-	char *mountpoint;
-
-	void *cookie;
-};
-
-int diskmenu_show(const char *title, const char *text,
-    struct partedit_item *items, int nitems, int *selected);
-
-#endif
diff --git a/bsdinstall/partedit/gpart_ops.c b/bsdinstall/partedit/gpart_ops.c
deleted file mode 100644
index b49ff1c9fd42..000000000000
--- a/bsdinstall/partedit/gpart_ops.c
+++ /dev/null
@@ -1,1460 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <libutil.h>
-#include <inttypes.h>
-
-#include <libgeom.h>
-#include <dialog.h>
-#include <dlg_keys.h>
-
-#include "partedit.h"
-
-#define GPART_FLAGS "x" /* Do not commit changes by default */
-
-static void
-gpart_show_error(const char *title, const char *explanation, const char *errstr)
-{
-	char *errmsg;
-	char message[512];
-	int error;
-
-	if (explanation == NULL)
-		explanation = "";
-
-	error = strtol(errstr, &errmsg, 0);
-	if (errmsg != errstr) {
-		while (errmsg[0] == ' ')
-			errmsg++;
-		if (errmsg[0] != '\0')
-			sprintf(message, "%s%s. %s", explanation,
-			    strerror(error), errmsg);
-		else
-			sprintf(message, "%s%s", explanation, strerror(error));
-	} else {
-		sprintf(message, "%s%s", explanation, errmsg);
-	}
-
-	dialog_msgbox(title, message, 0, 0, TRUE);
-}
-
-static int
-scheme_supports_labels(const char *scheme)
-{
-	if (strcmp(scheme, "APM") == 0)
-		return (1);
-	if (strcmp(scheme, "GPT") == 0)
-		return (1);
-
-	return (0);
-}
-
-static void
-newfs_command(const char *fstype, char *command, int use_default)
-{
-	if (strcmp(fstype, "freebsd-ufs") == 0) {
-		int i;
-		DIALOG_LISTITEM items[] = {
-			{"UFS1", "UFS Version 1",
-			    "Use version 1 of the UFS file system instead "
-			    "of version 2 (not recommended)", 0 },
-			{"SU", "Softupdates",
-			    "Enable softupdates (default)", 1 },
-			{"SUJ", "Softupdates journaling",
-			    "Enable file system journaling (default - "
-			    "turn off for SSDs)", 1 },
-			{"TRIM", "Enable SSD TRIM support",
-			    "Enable TRIM support, useful on solid-state drives",
-			    0 },
-		};
-
-		if (!use_default) {
-			int choice;
-			choice = dlg_checklist("UFS Options", "", 0, 0, 0,
-			    nitems(items), items, NULL,
-			    FLAG_CHECK, &i);
-			if (choice == 1) /* Cancel */
-				return;
-		}
-
-		strcpy(command, "newfs ");
-		for (i = 0; i < (int)nitems(items); i++) {
-			if (items[i].state == 0)
-				continue;
-			if (strcmp(items[i].name, "UFS1") == 0)
-				strcat(command, "-O1 ");
-			else if (strcmp(items[i].name, "SU") == 0)
-				strcat(command, "-U ");
-			else if (strcmp(items[i].name, "SUJ") == 0)
-				strcat(command, "-j ");
-			else if (strcmp(items[i].name, "TRIM") == 0)
-				strcat(command, "-t ");
-		}
-	} else if (strcmp(fstype, "freebsd-zfs") == 0) {
-		int i;
-		DIALOG_LISTITEM items[] = {
-			{"fletcher4", "checksum algorithm: fletcher4",
-			    "Use fletcher4 for data integrity checking. "
-			    "(default)", 1 },
-			{"fletcher2", "checksum algorithm: fletcher2",
-			    "Use fletcher2 for data integrity checking. "
-			    "(not recommended)", 0 },
-			{"sha256", "checksum algorithm: sha256",
-			    "Use sha256 for data integrity checking. "
-			    "(not recommended)", 0 },
-			{"atime", "Update atimes for files",
-			    "Disable atime update", 0 },
-		};
-
-		if (!use_default) {
-			int choice;
-			choice = dlg_checklist("ZFS Options", "", 0, 0, 0,
-			    nitems(items), items, NULL,
-			    FLAG_CHECK, &i);
-			if (choice == 1) /* Cancel */
-				return;
-		}
-
-		strcpy(command, "zpool create -f -m none ");
-		if (getenv("BSDINSTALL_TMPBOOT") != NULL) {
-			char zfsboot_path[MAXPATHLEN];
-			snprintf(zfsboot_path, sizeof(zfsboot_path), "%s/zfs",
-			    getenv("BSDINSTALL_TMPBOOT"));
-			mkdir(zfsboot_path, S_IRWXU | S_IRGRP | S_IXGRP |
-			    S_IROTH | S_IXOTH);
-			sprintf(command, "%s -o cachefile=%s/zpool.cache ",
-			    command, zfsboot_path);
-		}
-		for (i = 0; i < (int)nitems(items); i++) {
-			if (items[i].state == 0)
-				continue;
-			if (strcmp(items[i].name, "fletcher4") == 0)
-				strcat(command, "-O checksum=fletcher4 ");
-			else if (strcmp(items[i].name, "fletcher2") == 0)
-				strcat(command, "-O checksum=fletcher2 ");
-			else if (strcmp(items[i].name, "sha256") == 0)
-				strcat(command, "-O checksum=sha256 ");
-			else if (strcmp(items[i].name, "atime") == 0)
-				strcat(command, "-O atime=off ");
-		}
-	} else if (strcmp(fstype, "fat32") == 0 || strcmp(fstype, "efi") == 0 ||
-	     strcmp(fstype, "ms-basic-data") == 0) {
-		int i;
-		DIALOG_LISTITEM items[] = {
-			{"FAT32", "FAT Type 32",
-			    "Create a FAT32 filesystem (default)", 1 },
-			{"FAT16", "FAT Type 16",
-			    "Create a FAT16 filesystem", 0 },
-			{"FAT12", "FAT Type 12",
-			    "Create a FAT12 filesystem", 0 },
-		};
-
-		if (!use_default) {
-			int choice;
-			choice = dlg_checklist("FAT Options", "", 0, 0, 0,
-			    nitems(items), items, NULL,
-			    FLAG_RADIO, &i);
-			if (choice == 1) /* Cancel */
-				return;
-		}
-
-		strcpy(command, "newfs_msdos ");
-		for (i = 0; i < (int)nitems(items); i++) {
-			if (items[i].state == 0)
-				continue;
-			if (strcmp(items[i].name, "FAT32") == 0)
-				strcat(command, "-F 32 -c 1");
-			else if (strcmp(items[i].name, "FAT16") == 0)
-				strcat(command, "-F 16 ");
-			else if (strcmp(items[i].name, "FAT12") == 0)
-				strcat(command, "-F 12 ");
-		}
-	} else {
-		if (!use_default)
-			dialog_msgbox("Error", "No configurable options exist "
-			    "for this filesystem.", 0, 0, TRUE);
-		command[0] = '\0';
-	}
-}
-
-const char *
-choose_part_type(const char *def_scheme)
-{
-	int cancel, choice;
-	const char *scheme = NULL;
-
-	DIALOG_LISTITEM items[] = {
-		{"APM", "Apple Partition Map",
-		    "Bootable on PowerPC Apple Hardware", 0 },
-		{"BSD", "BSD Labels",
-		    "Bootable on most x86 systems", 0 },
-		{"GPT", "GUID Partition Table",
-		    "Bootable on most x86 systems and EFI aware ARM64", 0 },
-		{"MBR", "DOS Partitions",
-		    "Bootable on most x86 systems", 0 },
-	};
-
-parttypemenu:
-	dialog_vars.default_item = __DECONST(char *, def_scheme);
-	cancel = dlg_menu("Partition Scheme",
-	    "Select a partition scheme for this volume:", 0, 0, 0,
-	    nitems(items), items, &choice, NULL);
-	dialog_vars.default_item = NULL;
-
-	if (cancel)
-		return NULL;
-
-	if (!is_scheme_bootable(items[choice].name)) {
-		char message[512];
-		sprintf(message, "This partition scheme (%s) is not "
-		    "bootable on this platform. Are you sure you want "
-		    "to proceed?", items[choice].name);
-		dialog_vars.defaultno = TRUE;
-		cancel = dialog_yesno("Warning", message, 0, 0);
-		dialog_vars.defaultno = FALSE;
-		if (cancel) /* cancel */
-			goto parttypemenu;
-	}
-
-	scheme = items[choice].name;
-
-	return scheme;
-}
-
-int
-gpart_partition(const char *lg_name, const char *scheme)
-{
-	int cancel;
-	struct gctl_req *r;
-	const char *errstr;
-
-schememenu:
-	if (scheme == NULL) {
-		scheme = choose_part_type(default_scheme());
-
-		if (scheme == NULL)
-			return (-1);
-
-		if (!is_scheme_bootable(scheme)) {
-			char message[512];
-			sprintf(message, "This partition scheme (%s) is not "
-			    "bootable on this platform. Are you sure you want "
-			    "to proceed?", scheme);
-			dialog_vars.defaultno = TRUE;
-			cancel = dialog_yesno("Warning", message, 0, 0);
-			dialog_vars.defaultno = FALSE;
-			if (cancel) { /* cancel */
-				/* Reset scheme so user can choose another */
-				scheme = NULL;
-				goto schememenu;
-			}
-		}
-	}
-
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, lg_name);
-	gctl_ro_param(r, "flags", -1, GPART_FLAGS);
-	gctl_ro_param(r, "scheme", -1, scheme);
-	gctl_ro_param(r, "verb", -1, "create");
-
-	errstr = gctl_issue(r);
-	if (errstr != NULL && errstr[0] != '\0') {
-		gpart_show_error("Error", NULL, errstr);
-		gctl_free(r);
-		scheme = NULL;
-		goto schememenu;
-	}
-	gctl_free(r);
-
-	if (bootcode_path(scheme) != NULL)
-		get_part_metadata(lg_name, 1)->bootcode = 1;
-	return (0);
-}
-
-static void
-gpart_activate(struct gprovider *pp)
-{
-	struct gconfig *gc;
-	struct gctl_req *r;
-	const char *errstr, *scheme;
-	const char *attribute = NULL;
-	intmax_t idx;
-
-	/*
-	 * Some partition schemes need this partition to be marked 'active'
-	 * for it to be bootable.
-	 */
-	LIST_FOREACH(gc, &pp->lg_geom->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "scheme") == 0) {
-			scheme = gc->lg_val;
-			break;
-		}
-	}
-
-	if (strcmp(scheme, "MBR") == 0 || strcmp(scheme, "EBR") == 0)
-		attribute = "active";
-	else
-		return;
-
-	LIST_FOREACH(gc, &pp->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "index") == 0) {
-			idx = atoi(gc->lg_val);
-			break;
-		}
-	}
-
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, pp->lg_geom->lg_name);
-	gctl_ro_param(r, "verb", -1, "set");
-	gctl_ro_param(r, "attrib", -1, attribute);
-	gctl_ro_param(r, "index", sizeof(idx), &idx);
-
-	errstr = gctl_issue(r);
-	if (errstr != NULL && errstr[0] != '\0') 
-		gpart_show_error("Error", "Error marking partition active:",
-		    errstr);
-	gctl_free(r);
-}
-
-void
-gpart_set_root(const char *lg_name, const char *attribute)
-{
-	struct gctl_req *r;
-	const char *errstr;
-
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, lg_name);
-	gctl_ro_param(r, "flags", -1, "C");
-	gctl_ro_param(r, "verb", -1, "set");
-	gctl_ro_param(r, "attrib", -1, attribute);
-
-	errstr = gctl_issue(r);
-	if (errstr != NULL && errstr[0] != '\0') 
-		gpart_show_error("Error", "Error setting parameter on disk:",
-		    errstr);
-	gctl_free(r);
-}
-
-static void
-gpart_bootcode(struct ggeom *gp)
-{
-	const char *bootcode;
-	struct gconfig *gc;
-	struct gctl_req *r;
-	const char *errstr, *scheme;
-	uint8_t *boot;
-	size_t bootsize, bytes;
-	int bootfd;
-
-	/*
-	 * Write default bootcode to the newly partitioned disk, if that
-	 * applies on this platform.
-	 */
-	LIST_FOREACH(gc, &gp->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "scheme") == 0) {
-			scheme = gc->lg_val;
-			break;
-		}
-	}
-
-	bootcode = bootcode_path(scheme);
-	if (bootcode == NULL) 
-		return;
-
-	bootfd = open(bootcode, O_RDONLY);
-	if (bootfd < 0) {
-		dialog_msgbox("Bootcode Error", strerror(errno), 0, 0,
-		    TRUE);
-		return;
-	}
-
-	bootsize = lseek(bootfd, 0, SEEK_END);
-	boot = malloc(bootsize);
-	lseek(bootfd, 0, SEEK_SET);
-	bytes = 0;
-	while (bytes < bootsize)
-		bytes += read(bootfd, boot + bytes, bootsize - bytes);
-	close(bootfd);
-
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, gp->lg_name);
-	gctl_ro_param(r, "verb", -1, "bootcode");
-	gctl_ro_param(r, "bootcode", bootsize, boot);
-
-	errstr = gctl_issue(r);
-	if (errstr != NULL && errstr[0] != '\0') 
-		gpart_show_error("Bootcode Error", NULL, errstr);
-	gctl_free(r);
-	free(boot);
-}
-
-static void
-gpart_partcode(struct gprovider *pp, const char *fstype)
-{
-	struct gconfig *gc;
-	const char *scheme;
-	const char *indexstr;
-	char message[255], command[255];
-
-	LIST_FOREACH(gc, &pp->lg_geom->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "scheme") == 0) {
-			scheme = gc->lg_val;
-			break;
-		}
-	}
-
-	/* Make sure this partition scheme needs partcode on this platform */
-	if (partcode_path(scheme, fstype) == NULL)
-		return;
-
-	LIST_FOREACH(gc, &pp->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "index") == 0) {
-			indexstr = gc->lg_val;
-			break;
-		}
-	}
-
-	/* Shell out to gpart for partcode for now */
-	sprintf(command, "gpart bootcode -p %s -i %s %s",
-	    partcode_path(scheme, fstype), indexstr, pp->lg_geom->lg_name);
-	if (system(command) != 0) {
-		sprintf(message, "Error installing partcode on partition %s",
-		    pp->lg_name);
-		dialog_msgbox("Error", message, 0, 0, TRUE);
-	}
-}
-
-void
-gpart_destroy(struct ggeom *lg_geom)
-{
-	struct gctl_req *r;
-	struct gprovider *pp;
-	const char *errstr;
-	int force = 1;
-
-	/* Delete all child metadata */
-	LIST_FOREACH(pp, &lg_geom->lg_provider, lg_provider)
-		gpart_delete(pp);
-
-	/* Revert any local changes to get this geom into a pristine state */
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, lg_geom->lg_name);
-	gctl_ro_param(r, "verb", -1, "undo");
-	gctl_issue(r); /* Ignore errors -- these are non-fatal */
-	gctl_free(r);
-
-	/* Now destroy the geom itself */
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, lg_geom->lg_name);
-	gctl_ro_param(r, "flags", -1, GPART_FLAGS);
-	gctl_ro_param(r, "force", sizeof(force), &force);
-	gctl_ro_param(r, "verb", -1, "destroy");
-	errstr = gctl_issue(r);
-	if (errstr != NULL && errstr[0] != '\0') {
-		/*
-		 * Check if we reverted away the existence of the geom
-		 * altogether. Show all other errors to the user.
-		 */
-		if (strtol(errstr, NULL, 0) != EINVAL)
-			gpart_show_error("Error", NULL, errstr);
-	}
-	gctl_free(r);
-
-	/* And any metadata associated with the partition scheme itself */
-	delete_part_metadata(lg_geom->lg_name);
-}
-
-void
-gpart_edit(struct gprovider *pp)
-{
-	struct gctl_req *r;
-	struct gconfig *gc;
-	struct gconsumer *cp;
-	struct ggeom *geom;
-	const char *errstr, *oldtype, *scheme;
-	struct partition_metadata *md;
-	char sizestr[32];
-	char newfs[255];
-	intmax_t idx;
-	int hadlabel, choice, junk, nitems;
-	unsigned i;
-
-	DIALOG_FORMITEM items[] = {
-		{0, "Type:", 5, 0, 0, FALSE, "", 11, 0, 12, 15, 0,
-		    FALSE, "Filesystem type (e.g. freebsd-ufs, freebsd-zfs, "
-		    "freebsd-swap)", FALSE},
-		{0, "Size:", 5, 1, 0, FALSE, "", 11, 1, 12, 0, 0,
-		    FALSE, "Partition size. Append K, M, G for kilobytes, "
-		    "megabytes or gigabytes.", FALSE},
-		{0, "Mountpoint:", 11, 2, 0, FALSE, "", 11, 2, 12, 15, 0,
-		    FALSE, "Path at which to mount this partition (leave blank "
-		    "for swap, set to / for root filesystem)", FALSE},
-		{0, "Label:", 7, 3, 0, FALSE, "", 11, 3, 12, 15, 0, FALSE,
-		    "Partition name. Not all partition schemes support this.",
-		    FALSE},
-	};
-
-	/*
-	 * Find the PART geom we are manipulating. This may be a consumer of
-	 * this provider, or its parent. Check the consumer case first.
-	 */
-	geom = NULL;
-	LIST_FOREACH(cp, &pp->lg_consumers, lg_consumers)
-		if (strcmp(cp->lg_geom->lg_class->lg_name, "PART") == 0) {
-			/* Check for zombie geoms, treating them as blank */
-			scheme = NULL;
-			LIST_FOREACH(gc, &cp->lg_geom->lg_config, lg_config) {
-				if (strcmp(gc->lg_name, "scheme") == 0) {
-					scheme = gc->lg_val;
-					break;
-				}
-			}
-			if (scheme == NULL || strcmp(scheme, "(none)") == 0) {
-				gpart_partition(cp->lg_geom->lg_name, NULL);
-				return;
-			}
-
-			/* If this is a nested partition, edit as usual */
-			if (strcmp(pp->lg_geom->lg_class->lg_name, "PART") == 0)
-				break;
-
-			/* Destroy the geom and all sub-partitions */
-			gpart_destroy(cp->lg_geom);
-
-			/* Now re-partition and return */
-			gpart_partition(cp->lg_geom->lg_name, NULL);
-			return;
-		}
-
-	if (geom == NULL && strcmp(pp->lg_geom->lg_class->lg_name, "PART") == 0)
-		geom = pp->lg_geom;
-
-	if (geom == NULL) {
-		/* Disk not partitioned, so partition it */
-		gpart_partition(pp->lg_name, NULL);
-		return;
-	}
-
-	LIST_FOREACH(gc, &geom->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "scheme") == 0) {
-			scheme = gc->lg_val;
-			break;
-		}
-	}
-
-	nitems = scheme_supports_labels(scheme) ? 4 : 3;
-
-	/* Edit editable parameters of a partition */
-	hadlabel = 0;
-	LIST_FOREACH(gc, &pp->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "type") == 0) {
-			oldtype = gc->lg_val;
-			items[0].text = gc->lg_val;
-		}
-		if (strcmp(gc->lg_name, "label") == 0 && gc->lg_val != NULL) {
-			hadlabel = 1;
-			items[3].text = gc->lg_val;
-		}
-		if (strcmp(gc->lg_name, "index") == 0)
-			idx = atoi(gc->lg_val);
-	}
-
-	TAILQ_FOREACH(md, &part_metadata, metadata) {
-		if (md->name != NULL && strcmp(md->name, pp->lg_name) == 0) {
-			if (md->fstab != NULL)
-				items[2].text = md->fstab->fs_file;
-			break;
-		}
-	}
-
-	humanize_number(sizestr, 7, pp->lg_mediasize, "B", HN_AUTOSCALE,
-	    HN_NOSPACE | HN_DECIMAL);
-	items[1].text = sizestr;
-
-editpart:
-	choice = dlg_form("Edit Partition", "", 0, 0, 0, nitems, items, &junk);
-
-	if (choice) /* Cancel pressed */
-		goto endedit;
-
-	/* If this is the root partition, check that this fs is bootable */
-	if (strcmp(items[2].text, "/") == 0 && !is_fs_bootable(scheme,
-	    items[0].text)) {
-		char message[512];
-		sprintf(message, "This file system (%s) is not bootable "
-		    "on this system. Are you sure you want to proceed?",
-		    items[0].text);
-		dialog_vars.defaultno = TRUE;
-		choice = dialog_yesno("Warning", message, 0, 0);
-		dialog_vars.defaultno = FALSE;
-		if (choice == 1) /* cancel */
-			goto editpart;
-	}
-
-	/* Check if the label has a / in it */
-	if (strchr(items[3].text, '/') != NULL) {
-		dialog_msgbox("Error", "Label contains a /, which is not an "
-		    "allowed character.", 0, 0, TRUE);
-		goto editpart;
-	}
-
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, geom->lg_name);
-	gctl_ro_param(r, "flags", -1, GPART_FLAGS);
-	gctl_ro_param(r, "verb", -1, "modify");
-	gctl_ro_param(r, "index", sizeof(idx), &idx);
-	if (hadlabel || items[3].text[0] != '\0')
-		gctl_ro_param(r, "label", -1, items[3].text);
-	gctl_ro_param(r, "type", -1, items[0].text);
-	errstr = gctl_issue(r);
-	if (errstr != NULL && errstr[0] != '\0') {
-		gpart_show_error("Error", NULL, errstr);
-		gctl_free(r);
-		goto editpart;
-	}
-	gctl_free(r);
-
-	newfs_command(items[0].text, newfs, 1);
-	set_default_part_metadata(pp->lg_name, scheme, items[0].text,
-	    items[2].text, (strcmp(oldtype, items[0].text) != 0) ?
-	    newfs : NULL);
-
-endedit:
-	if (strcmp(oldtype, items[0].text) != 0 && cp != NULL)
-		gpart_destroy(cp->lg_geom);
-	if (strcmp(oldtype, items[0].text) != 0 && strcmp(items[0].text,
-	    "freebsd") == 0)
-		gpart_partition(pp->lg_name, "BSD");
-
-	for (i = 0; i < nitems(items); i++)
-		if (items[i].text_free)
-			free(items[i].text);
-}
-
-void
-set_default_part_metadata(const char *name, const char *scheme,
-    const char *type, const char *mountpoint, const char *newfs)
-{
-	struct partition_metadata *md;
-	char *zpool_name = NULL;
-	const char *default_bootmount = NULL;
-	int i;
-
-	/* Set part metadata */
-	md = get_part_metadata(name, 1);
-
-	if (newfs) {
-		if (md->newfs != NULL) {
-			free(md->newfs);
-			md->newfs = NULL;
-		}
-
-		if (newfs != NULL && newfs[0] != '\0') {
-			md->newfs = malloc(strlen(newfs) + strlen(" /dev/") +
-			    strlen(mountpoint) + 5 + strlen(name) + 1);
-			if (strcmp("freebsd-zfs", type) == 0) {
-				zpool_name = strdup((strlen(mountpoint) == 1) ?
-				    "root" : &mountpoint[1]);
-				for (i = 0; zpool_name[i] != 0; i++)
-					if (!isalnum(zpool_name[i]))
-						zpool_name[i] = '_';
-				sprintf(md->newfs, "%s %s /dev/%s", newfs,
-				    zpool_name, name);
-			} else {
-				sprintf(md->newfs, "%s /dev/%s", newfs, name);
-			}
-		}
-	}
-
-	if (strcmp(type, "freebsd-swap") == 0)
-		mountpoint = "none";
-	if (strcmp(type, bootpart_type(scheme, &default_bootmount)) == 0) {
-		if (default_bootmount == NULL)
-			md->bootcode = 1;
-		else if (mountpoint == NULL || strlen(mountpoint) == 0)
-			mountpoint = default_bootmount;
-	}
-
-	if (mountpoint == NULL || mountpoint[0] == '\0') {
-		if (md->fstab != NULL) {
-			free(md->fstab->fs_spec);
-			free(md->fstab->fs_file);
-			free(md->fstab->fs_vfstype);
-			free(md->fstab->fs_mntops);
-			free(md->fstab->fs_type);
-			free(md->fstab);
-			md->fstab = NULL;
-		}
-	} else {
-		if (md->fstab == NULL) {
-			md->fstab = malloc(sizeof(struct fstab));
-		} else {
-			free(md->fstab->fs_spec);
-			free(md->fstab->fs_file);
-			free(md->fstab->fs_vfstype);
-			free(md->fstab->fs_mntops);
-			free(md->fstab->fs_type);
-		}
-		if (strcmp("freebsd-zfs", type) == 0) {
-			md->fstab->fs_spec = strdup(zpool_name);
-		} else {
-			md->fstab->fs_spec = malloc(strlen(name) +
-			    strlen("/dev/") + 1);
-			sprintf(md->fstab->fs_spec, "/dev/%s", name);
-		}
-		md->fstab->fs_file = strdup(mountpoint);
-		/* Get VFS from text after freebsd-, if possible */
-		if (strncmp("freebsd-", type, 8) == 0)
-			md->fstab->fs_vfstype = strdup(&type[8]);
-		else if (strcmp("fat32", type) == 0 || strcmp("efi", type) == 0
-	     	    || strcmp("ms-basic-data", type) == 0)
-			md->fstab->fs_vfstype = strdup("msdosfs");
-		else
-			md->fstab->fs_vfstype = strdup(type); /* Guess */
-		if (strcmp(type, "freebsd-swap") == 0) {
-			md->fstab->fs_type = strdup(FSTAB_SW);
-			md->fstab->fs_freq = 0;
-			md->fstab->fs_passno = 0;
-		} else if (strcmp(type, "freebsd-zfs") == 0) {
-			md->fstab->fs_type = strdup(FSTAB_RW);
-			md->fstab->fs_freq = 0;
-			md->fstab->fs_passno = 0;
-		} else {
-			md->fstab->fs_type = strdup(FSTAB_RW);
-			if (strcmp(mountpoint, "/") == 0) {
-				md->fstab->fs_freq = 1;
-				md->fstab->fs_passno = 1;
-			} else {
-				md->fstab->fs_freq = 2;
-				md->fstab->fs_passno = 2;
-			}
-		}
-		md->fstab->fs_mntops = strdup(md->fstab->fs_type);
-	}
-
-	if (zpool_name != NULL)
-		free(zpool_name);
-}
-
-static
-int part_compare(const void *xa, const void *xb)
-{
-	struct gprovider **a = (struct gprovider **)xa;
-	struct gprovider **b = (struct gprovider **)xb;
-	intmax_t astart, bstart;
-	struct gconfig *gc;
-	
-	astart = bstart = 0;
-	LIST_FOREACH(gc, &(*a)->lg_config, lg_config)
-		if (strcmp(gc->lg_name, "start") == 0) {
-			astart = strtoimax(gc->lg_val, NULL, 0);
-			break;
-		}
-	LIST_FOREACH(gc, &(*b)->lg_config, lg_config)
-		if (strcmp(gc->lg_name, "start") == 0) {
-			bstart = strtoimax(gc->lg_val, NULL, 0);
-			break;
-		}
-
-	if (astart < bstart)
-		return -1;
-	else if (astart > bstart)
-		return 1;
-	else
-		return 0;
-}
-
-intmax_t
-gpart_max_free(struct ggeom *geom, intmax_t *npartstart)
-{
-	struct gconfig *gc;
-	struct gprovider *pp, **providers;
-	intmax_t sectorsize, stripesize, offset;
-	intmax_t lastend;
-	intmax_t start, end;
-	intmax_t maxsize, maxstart;
-	intmax_t partstart, partend;
-	int i, nparts;
-
-	/* Now get the maximum free size and free start */
-	start = end = 0;
-	LIST_FOREACH(gc, &geom->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "first") == 0)
-			start = strtoimax(gc->lg_val, NULL, 0);
-		if (strcmp(gc->lg_name, "last") == 0)
-			end = strtoimax(gc->lg_val, NULL, 0);
-	}
-
-	i = nparts = 0;
-	LIST_FOREACH(pp, &geom->lg_provider, lg_provider)
-		nparts++;
-	providers = calloc(nparts, sizeof(providers[0]));
-	LIST_FOREACH(pp, &geom->lg_provider, lg_provider)
-		providers[i++] = pp;
-	qsort(providers, nparts, sizeof(providers[0]), part_compare);
-
-	lastend = start - 1;
-	maxsize = 0;
-	for (i = 0; i < nparts; i++) {
-		pp = providers[i];
-
-		LIST_FOREACH(gc, &pp->lg_config, lg_config) {
-			if (strcmp(gc->lg_name, "start") == 0)
-				partstart = strtoimax(gc->lg_val, NULL, 0);
-			if (strcmp(gc->lg_name, "end") == 0)
-				partend = strtoimax(gc->lg_val, NULL, 0);
-		}
-
-		if (partstart - lastend > maxsize) {
-			maxsize = partstart - lastend - 1;
-			maxstart = lastend + 1;
-		}
-
-		lastend = partend;
-	}
-
-	if (end - lastend > maxsize) {
-		maxsize = end - lastend;
-		maxstart = lastend + 1;
-	}
-
-	pp = LIST_FIRST(&geom->lg_consumer)->lg_provider;
-
-	/*
-	 * Round the start and size of the largest available space up to
-	 * the nearest multiple of the adjusted stripe size.
-	 *
-	 * The adjusted stripe size is the least common multiple of the
-	 * actual stripe size, or the sector size if no stripe size was
-	 * reported, and 4096.  The reason for this is that contemporary
-	 * disks often have 4096-byte physical sectors but report 512
-	 * bytes instead for compatibility with older / broken operating
-	 * systems and BIOSes.  For the same reasons, virtualized storage
-	 * may also report a 512-byte stripe size, or none at all.
-	 */
-	sectorsize = pp->lg_sectorsize;
-	if ((stripesize = pp->lg_stripesize) == 0)
-		stripesize = sectorsize;
-	while (stripesize % 4096 != 0)
-		stripesize *= 2;
-	if ((offset = maxstart * sectorsize % stripesize) != 0) {
-		offset = (stripesize - offset) / sectorsize;
-		maxstart += offset;
-		maxsize -= offset;
-	}
-
-	if (npartstart != NULL)
-		*npartstart = maxstart;
-
-	return (maxsize);
-}
-
-static size_t
-add_boot_partition(struct ggeom *geom, struct gprovider *pp,
-    const char *scheme, int interactive)
-{
-	struct gconfig *gc;
-	struct gprovider *ppi;
-	int choice;
-
-	/* Check for existing freebsd-boot partition */
-	LIST_FOREACH(ppi, &geom->lg_provider, lg_provider) {
-		struct partition_metadata *md;
-		const char *bootmount = NULL;
-
-		LIST_FOREACH(gc, &ppi->lg_config, lg_config)
-			if (strcmp(gc->lg_name, "type") == 0)
-				break;
-		if (gc == NULL)
-			continue;
-		if (strcmp(gc->lg_val, bootpart_type(scheme, &bootmount)) != 0)
-			continue;
-
-		/*
-		 * If the boot partition is not mountable and needs partcode,
-		 * but doesn't have it, it doesn't satisfy our requirements.
-		 */
-		md = get_part_metadata(ppi->lg_name, 0);
-		if (bootmount == NULL && (md == NULL || !md->bootcode))
-			continue;
-
-		/* If it is mountable, but mounted somewhere else, remount */
-		if (bootmount != NULL && md != NULL && md->fstab != NULL
-		    && strlen(md->fstab->fs_file) > 0
-		    && strcmp(md->fstab->fs_file, bootmount) != 0)
-			continue;
-
-		/* If it is mountable, but mountpoint is not set, mount it */
-		if (bootmount != NULL && md == NULL)
-			set_default_part_metadata(ppi->lg_name, scheme,
-			    gc->lg_val, bootmount, NULL);
-		
-		/* Looks good at this point, no added data needed */
-		return (0);
-	}
-
-	if (interactive)
-		choice = dialog_yesno("Boot Partition",
-		    "This partition scheme requires a boot partition "
-		    "for the disk to be bootable. Would you like to "
-		    "make one now?", 0, 0);
-	else
-		choice = 0;
-
-	if (choice == 0) { /* yes */
-		struct partition_metadata *md;
-		const char *bootmount = NULL;
-		char *bootpartname = NULL;
-		char sizestr[7];
-
-		humanize_number(sizestr, 7,
-		    bootpart_size(scheme), "B", HN_AUTOSCALE,
-		    HN_NOSPACE | HN_DECIMAL);
-
-		gpart_create(pp, bootpart_type(scheme, &bootmount),
-		    sizestr, bootmount, &bootpartname, 0);
-
-		if (bootpartname == NULL) /* Error reported to user already */
-			return 0;
-
-		/* If the part is not mountable, make sure newfs isn't set */
-		if (bootmount == NULL) {
-			md = get_part_metadata(bootpartname, 0);
-			if (md != NULL && md->newfs != NULL) {
-				free(md->newfs);
-				md->newfs = NULL;
-			}
-		}
-
-		free(bootpartname);
-
-		return (bootpart_size(scheme));
-	}
-	
-	return (0);
-}
-
-void
-gpart_create(struct gprovider *pp, const char *default_type,
-    const char *default_size, const char *default_mountpoint,
-    char **partname, int interactive)
-{
-	struct gctl_req *r;
-	struct gconfig *gc;
-	struct gconsumer *cp;
-	struct ggeom *geom;
-	const char *errstr, *scheme;
-	char sizestr[32], startstr[32], output[64], *newpartname;
-	char newfs[255], options_fstype[64];
-	intmax_t maxsize, size, sector, firstfree, stripe;
-	uint64_t bytes;
-	int nitems, choice, junk;
-	unsigned i;
-
-	DIALOG_FORMITEM items[] = {
-		{0, "Type:", 5, 0, 0, FALSE, "freebsd-ufs", 11, 0, 12, 15, 0,
-		    FALSE, "Filesystem type (e.g. freebsd-ufs, freebsd-zfs, "
-		    "freebsd-swap)", FALSE},
-		{0, "Size:", 5, 1, 0, FALSE, "", 11, 1, 12, 15, 0,
-		    FALSE, "Partition size. Append K, M, G for kilobytes, "
-		    "megabytes or gigabytes.", FALSE},
-		{0, "Mountpoint:", 11, 2, 0, FALSE, "", 11, 2, 12, 15, 0,
-		    FALSE, "Path at which to mount partition (blank for "
-		    "swap, / for root filesystem)", FALSE},
-		{0, "Label:", 7, 3, 0, FALSE, "", 11, 3, 12, 15, 0, FALSE,
-		    "Partition name. Not all partition schemes support this.",
-		    FALSE},
-	};
-
-	if (partname != NULL)
-		*partname = NULL;
-
-	/* Record sector and stripe sizes */
-	sector = pp->lg_sectorsize;
-	stripe = pp->lg_stripesize;
-
-	/*
-	 * Find the PART geom we are manipulating. This may be a consumer of
-	 * this provider, or its parent. Check the consumer case first.
-	 */
-	geom = NULL;
-	LIST_FOREACH(cp, &pp->lg_consumers, lg_consumers)
-		if (strcmp(cp->lg_geom->lg_class->lg_name, "PART") == 0) {
-			geom = cp->lg_geom;
-			break;
-		}
-
-	if (geom == NULL && strcmp(pp->lg_geom->lg_class->lg_name, "PART") == 0)
-		geom = pp->lg_geom;
-
-	/* Now get the partition scheme */
-	scheme = NULL;
-	if (geom != NULL) {
-		LIST_FOREACH(gc, &geom->lg_config, lg_config) 
-			if (strcmp(gc->lg_name, "scheme") == 0)
-				scheme = gc->lg_val;
-	}
-
-	if (geom == NULL || scheme == NULL || strcmp(scheme, "(none)") == 0) {
-		if (gpart_partition(pp->lg_name, NULL) == 0)
-			dialog_msgbox("",
-			    "The partition table has been successfully created."
-			    " Please press Create again to create partitions.",
-			    0, 0, TRUE);
-
-		return;
-	}
-
-	/*
-	 * If we still don't have a geom, either the user has
-	 * canceled partitioning or there has been an error which has already
-	 * been displayed, so bail.
-	 */
-	if (geom == NULL)
-		return;
-
-	maxsize = size = gpart_max_free(geom, &firstfree);
-	if (size <= 0) {
-		dialog_msgbox("Error", "No free space left on device.", 0, 0,
-		    TRUE);
-		return;
-	}
-
-	humanize_number(sizestr, 7, size*sector, "B", HN_AUTOSCALE,
-	    HN_NOSPACE | HN_DECIMAL);
-	items[1].text = sizestr;
-
-	/* Special-case the MBR default type for nested partitions */
-	if (strcmp(scheme, "MBR") == 0) {
-		items[0].text = "freebsd";
-		items[0].help = "Filesystem type (e.g. freebsd, fat32)";
-	}
-
-	nitems = scheme_supports_labels(scheme) ? 4 : 3;
-
-	if (default_type != NULL)
-		items[0].text = (char *)default_type;
-	if (default_size != NULL)
-		items[1].text = (char *)default_size;
-	if (default_mountpoint != NULL)
-		items[2].text = (char *)default_mountpoint;
-
-	/* Default options */
-	strncpy(options_fstype, items[0].text,
-	    sizeof(options_fstype));
-	newfs_command(options_fstype, newfs, 1);
-addpartform:
-	if (interactive) {
-		dialog_vars.extra_label = "Options";
-		dialog_vars.extra_button = TRUE;
-		choice = dlg_form("Add Partition", "", 0, 0, 0, nitems,
-		    items, &junk);
-		dialog_vars.extra_button = FALSE;
-		switch (choice) {
-		case 0: /* OK */
-			break;
-		case 1: /* Cancel */
-			return;
-		case 3: /* Options */
-			strncpy(options_fstype, items[0].text,
-			    sizeof(options_fstype));
-			newfs_command(options_fstype, newfs, 0);
-			goto addpartform;
-		}
-	}
-
-	/*
-	 * If the user changed the fs type after specifying options, undo
-	 * their choices in favor of the new filesystem's defaults.
-	 */
-	if (strcmp(options_fstype, items[0].text) != 0) {
-		strncpy(options_fstype, items[0].text, sizeof(options_fstype));
-		newfs_command(options_fstype, newfs, 1);
-	}
-
-	size = maxsize;
-	if (strlen(items[1].text) > 0) {
-		if (expand_number(items[1].text, &bytes) != 0) {
-			char error[512];
-
-			sprintf(error, "Invalid size: %s\n", strerror(errno));
-			dialog_msgbox("Error", error, 0, 0, TRUE);
-			goto addpartform;
-		}
-		size = MIN((intmax_t)(bytes/sector), maxsize);
-	}
-
-	/* Check if the label has a / in it */
-	if (strchr(items[3].text, '/') != NULL) {
-		dialog_msgbox("Error", "Label contains a /, which is not an "
-		    "allowed character.", 0, 0, TRUE);
-		goto addpartform;
-	}
-
-	/* Warn if no mountpoint set */
-	if (strcmp(items[0].text, "freebsd-ufs") == 0 &&
-	    items[2].text[0] != '/') {
-		choice = 0;
-		if (interactive) {
-			dialog_vars.defaultno = TRUE;
-			choice = dialog_yesno("Warning",
-			    "This partition does not have a valid mountpoint "
-			    "(for the partition from which you intend to boot the "
-			    "operating system, the mountpoint should be /). Are you "
-			    "sure you want to continue?"
-			, 0, 0);
-			dialog_vars.defaultno = FALSE;
-		}
-		if (choice == 1) /* cancel */
-			goto addpartform;
-	}
-
-	/*
-	 * Error if this scheme needs nested partitions, this is one, and
-	 * a mountpoint was set.
-	 */
-	if (strcmp(items[0].text, "freebsd") == 0 &&
-	    strlen(items[2].text) > 0) {
-		dialog_msgbox("Error", "Partitions of type \"freebsd\" are "
-		    "nested BSD-type partition schemes and cannot have "
-		    "mountpoints. After creating one, select it and press "
-		    "Create again to add the actual file systems.", 0, 0, TRUE);
-		goto addpartform;
-	}
-
-	/* If this is the root partition, check that this scheme is bootable */
-	if (strcmp(items[2].text, "/") == 0 && !is_scheme_bootable(scheme)) {
-		char message[512];
-		sprintf(message, "This partition scheme (%s) is not bootable "
-		    "on this platform. Are you sure you want to proceed?",
-		    scheme);
-		dialog_vars.defaultno = TRUE;
-		choice = dialog_yesno("Warning", message, 0, 0);
-		dialog_vars.defaultno = FALSE;
-		if (choice == 1) /* cancel */
-			goto addpartform;
-	}
-
-	/* If this is the root partition, check that this fs is bootable */
-	if (strcmp(items[2].text, "/") == 0 && !is_fs_bootable(scheme,
-	    items[0].text)) {
-		char message[512];
-		sprintf(message, "This file system (%s) is not bootable "
-		    "on this system. Are you sure you want to proceed?",
-		    items[0].text);
-		dialog_vars.defaultno = TRUE;
-		choice = dialog_yesno("Warning", message, 0, 0);
-		dialog_vars.defaultno = FALSE;
-		if (choice == 1) /* cancel */
-			goto addpartform;
-	}
-
-	/*
-	 * If this is the root partition, and we need a boot partition, ask
-	 * the user to add one.
-	 */
-
-	if ((strcmp(items[0].text, "freebsd") == 0 ||
-	    strcmp(items[2].text, "/") == 0) && bootpart_size(scheme) > 0) {
-		size_t bytes = add_boot_partition(geom, pp, scheme,
-		    interactive);
-
-		/* Now adjust the part we are really adding forward */
-		if (bytes > 0) {
-			firstfree += bytes / sector;
-			size -= (bytes + stripe)/sector;
-			if (stripe > 0 && (firstfree*sector % stripe) != 0) 
-				firstfree += (stripe - ((firstfree*sector) %
-				    stripe)) / sector;
-		}
-	}
-
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, geom->lg_name);
-	gctl_ro_param(r, "flags", -1, GPART_FLAGS);
-	gctl_ro_param(r, "verb", -1, "add");
-
-	gctl_ro_param(r, "type", -1, items[0].text);
-	snprintf(sizestr, sizeof(sizestr), "%jd", size);
-	gctl_ro_param(r, "size", -1, sizestr);
-	snprintf(startstr, sizeof(startstr), "%jd", firstfree);
-	gctl_ro_param(r, "start", -1, startstr);
-	if (items[3].text[0] != '\0')
-		gctl_ro_param(r, "label", -1, items[3].text);
-	gctl_rw_param(r, "output", sizeof(output), output);
-	errstr = gctl_issue(r);
-	if (errstr != NULL && errstr[0] != '\0') {
-		gpart_show_error("Error", NULL, errstr);
-		gctl_free(r);
-		goto addpartform;
-	}
-	newpartname = strtok(output, " ");
-	gctl_free(r);
-
-	/*
-	 * Try to destroy any geom that gpart picked up already here from
-	 * dirty blocks.
-	 */
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, "PART");
-	gctl_ro_param(r, "arg0", -1, newpartname);
-	gctl_ro_param(r, "flags", -1, GPART_FLAGS);
-	junk = 1;
-	gctl_ro_param(r, "force", sizeof(junk), &junk);
-	gctl_ro_param(r, "verb", -1, "destroy");
-	gctl_issue(r); /* Error usually expected and non-fatal */
-	gctl_free(r);
-
-
-	if (strcmp(items[0].text, "freebsd") == 0)
-		gpart_partition(newpartname, "BSD");
-	else
-		set_default_part_metadata(newpartname, scheme,
-		    items[0].text, items[2].text, newfs);
-
-	for (i = 0; i < nitems(items); i++)
-		if (items[i].text_free)
-			free(items[i].text);
-
-	if (partname != NULL)
-		*partname = strdup(newpartname);
-}
-	
-void
-gpart_delete(struct gprovider *pp)
-{
-	struct gconfig *gc;
-	struct ggeom *geom;
-	struct gconsumer *cp;
-	struct gctl_req *r;
-	const char *errstr;
-	intmax_t idx;
-	int is_partition;
-
-	/* Is it a partition? */
-	is_partition = (strcmp(pp->lg_geom->lg_class->lg_name, "PART") == 0);
-
-	/* Find out if this is the root of a gpart geom */
-	geom = NULL;
-	LIST_FOREACH(cp, &pp->lg_consumers, lg_consumers)
-		if (strcmp(cp->lg_geom->lg_class->lg_name, "PART") == 0) {
-			geom = cp->lg_geom;
-			break;
-		}
-
-	/* If so, destroy all children */
-	if (geom != NULL) {
-		gpart_destroy(geom);
-
-		/* If this is a partition, revert it, so it can be deleted */
-		if (is_partition) {
-			r = gctl_get_handle();
-			gctl_ro_param(r, "class", -1, "PART");
-			gctl_ro_param(r, "arg0", -1, geom->lg_name);
-			gctl_ro_param(r, "verb", -1, "undo");
-			gctl_issue(r); /* Ignore non-fatal errors */
-			gctl_free(r);
-		}
-	}
-
-	/*
-	 * If this is not a partition, see if that is a problem, complain if
-	 * necessary, and return always, since we need not do anything further,
-	 * error or no.
-	 */
-	if (!is_partition) {
-		if (geom == NULL)
-			dialog_msgbox("Error",
-			    "Only partitions can be deleted.", 0, 0, TRUE);
-		return;
-	}
-
-	r = gctl_get_handle();
-	gctl_ro_param(r, "class", -1, pp->lg_geom->lg_class->lg_name);
-	gctl_ro_param(r, "arg0", -1, pp->lg_geom->lg_name);
-	gctl_ro_param(r, "flags", -1, GPART_FLAGS);
-	gctl_ro_param(r, "verb", -1, "delete");
-
-	LIST_FOREACH(gc, &pp->lg_config, lg_config) {
-		if (strcmp(gc->lg_name, "index") == 0) {
-			idx = atoi(gc->lg_val);
-			gctl_ro_param(r, "index", sizeof(idx), &idx);
-			break;
-		}
-	}
-
-	errstr = gctl_issue(r);
-	if (errstr != NULL && errstr[0] != '\0') {
-		gpart_show_error("Error", NULL, errstr);
-		gctl_free(r);
-		return;
-	}
-
-	gctl_free(r);
-
-	delete_part_metadata(pp->lg_name);
-}
-
-void
-gpart_revert_all(struct gmesh *mesh)
-{
-	struct gclass *classp;
-	struct gconfig *gc;
-	struct ggeom *gp;
-	struct gctl_req *r;
-	const char *modified;
-
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
-		if (strcmp(classp->lg_name, "PART") == 0)
-			break;
-	}
-
-	if (strcmp(classp->lg_name, "PART") != 0) {
-		dialog_msgbox("Error", "gpart not found!", 0, 0, TRUE);
-		return;
-	}
-
-	LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
-		modified = "true"; /* XXX: If we don't know (kernel too old),
-				    * assume there are modifications. */
-		LIST_FOREACH(gc, &gp->lg_config, lg_config) {
-			if (strcmp(gc->lg_name, "modified") == 0) {
-				modified = gc->lg_val;
-				break;
-			}
-		}
-
-		if (strcmp(modified, "false") == 0)
-			continue;
-
-		r = gctl_get_handle();
-		gctl_ro_param(r, "class", -1, "PART");
-		gctl_ro_param(r, "arg0", -1, gp->lg_name);
-		gctl_ro_param(r, "verb", -1, "undo");
-
-		gctl_issue(r);
-		gctl_free(r);
-	}
-}
-
-void
-gpart_commit(struct gmesh *mesh)
-{
-	struct partition_metadata *md;
-	struct gclass *classp;
-	struct ggeom *gp;
-	struct gconfig *gc;
-	struct gconsumer *cp;
-	struct gprovider *pp;
-	struct gctl_req *r;
-	const char *errstr;
-	const char *modified;
-	const char *rootfs;
-
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
-		if (strcmp(classp->lg_name, "PART") == 0)
-			break;
-	}
-
-	/* Figure out what filesystem / uses */
-	rootfs = "ufs"; /* Assume ufs if nothing else present */
-	TAILQ_FOREACH(md, &part_metadata, metadata) {
-		if (md->fstab != NULL && strcmp(md->fstab->fs_file, "/") == 0) {
-			rootfs = md->fstab->fs_vfstype;
-			break;
-		}
-	}
-
-	if (strcmp(classp->lg_name, "PART") != 0) {
-		dialog_msgbox("Error", "gpart not found!", 0, 0, TRUE);
-		return;
-	}
-
-	LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
-		modified = "true"; /* XXX: If we don't know (kernel too old),
-				    * assume there are modifications. */
-		LIST_FOREACH(gc, &gp->lg_config, lg_config) {
-			if (strcmp(gc->lg_name, "modified") == 0) {
-				modified = gc->lg_val;
-				break;
-			}
-		}
-
-		if (strcmp(modified, "false") == 0)
-			continue;
-
-		/* Add bootcode if necessary, before the commit */
-		md = get_part_metadata(gp->lg_name, 0);
-		if (md != NULL && md->bootcode)
-			gpart_bootcode(gp);
-
-		/* Now install partcode on its partitions, if necessary */
-		LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
-			md = get_part_metadata(pp->lg_name, 0);
-			if (md == NULL || !md->bootcode)
-				continue;
-		
-			/* Mark this partition active if that's required */
-			gpart_activate(pp);
-
-			/* Check if the partition has sub-partitions */
-			LIST_FOREACH(cp, &pp->lg_consumers, lg_consumers)
-				if (strcmp(cp->lg_geom->lg_class->lg_name,
-				    "PART") == 0)
-					break;
-
-			if (cp == NULL) /* No sub-partitions */
-				gpart_partcode(pp, rootfs);
-		}
-
-		r = gctl_get_handle();
-		gctl_ro_param(r, "class", -1, "PART");
-		gctl_ro_param(r, "arg0", -1, gp->lg_name);
-		gctl_ro_param(r, "verb", -1, "commit");
-
-		errstr = gctl_issue(r);
-		if (errstr != NULL && errstr[0] != '\0') 
-			gpart_show_error("Error", NULL, errstr);
-		gctl_free(r);
-	}
-}
-
diff --git a/bsdinstall/partedit/part_wizard.c b/bsdinstall/partedit/part_wizard.c
deleted file mode 100644
index 52c5d7f649cc..000000000000
--- a/bsdinstall/partedit/part_wizard.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <libutil.h>
-#include <string.h>
-
-#include <libgeom.h>
-#include <dialog.h>
-#include <dlg_keys.h>
-
-#include "partedit.h"
-
-#define MIN_FREE_SPACE		(1024*1024*1024) /* 1 GB */
-#define SWAP_SIZE(available)	MIN(available/20, 4*1024*1024*1024LL)
-
-static char *wizard_partition(struct gmesh *mesh, const char *disk);
-
-int
-part_wizard(const char *fsreq)
-{
-	char *disk, *schemeroot;
-	const char *fstype;
-	struct gmesh mesh;
-	int error;
-
-	if (fsreq != NULL)
-		fstype = fsreq;
-	else
-		fstype = "ufs";
-
-startwizard:
-	error = geom_gettree(&mesh);
-
-	dlg_put_backtitle();
-	error = geom_gettree(&mesh);
-	disk = boot_disk_select(&mesh);
-	if (disk == NULL)
-		return (1);
-
-	dlg_clear();
-	dlg_put_backtitle();
-	schemeroot = wizard_partition(&mesh, disk);
-	free(disk);
-	if (schemeroot == NULL)
-		return (1);
-
-	geom_deletetree(&mesh);
-	dlg_clear();
-	dlg_put_backtitle();
-	error = geom_gettree(&mesh);
-
-	error = wizard_makeparts(&mesh, schemeroot, fstype, 1);
-	if (error)
-		goto startwizard;
-	free(schemeroot);
-
-	geom_deletetree(&mesh);
-
-	return (0);
-}
-
-char *
-boot_disk_select(struct gmesh *mesh)
-{
-	struct gclass *classp;
-	struct gconfig *gc;
-	struct ggeom *gp;
-	struct gprovider *pp;
-	DIALOG_LISTITEM *disks = NULL;
-	const char *type, *desc;
-	char diskdesc[512];
-	char *chosen;
-	int i, err, selected, n = 0;
-
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
-		if (strcmp(classp->lg_name, "DISK") != 0 &&
-		    strcmp(classp->lg_name, "RAID") != 0 &&
-		    strcmp(classp->lg_name, "MD") != 0)
-			continue;
-
-		LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
-			if (LIST_EMPTY(&gp->lg_provider))
-				continue;
-
-			LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
-				desc = type = NULL;
-				LIST_FOREACH(gc, &pp->lg_config, lg_config) {
-					if (strcmp(gc->lg_name, "type") == 0)
-						type = gc->lg_val;
-					if (strcmp(gc->lg_name, "descr") == 0)
-						desc = gc->lg_val;
-				}
-
-				/* Skip swap-backed md and WORM devices */
-				if (strcmp(classp->lg_name, "MD") == 0 &&
-				    type != NULL && strcmp(type, "swap") == 0)
-					continue;
-				if (strncmp(pp->lg_name, "cd", 2) == 0)
-					continue;
-
-				disks = realloc(disks, (++n)*sizeof(disks[0]));
-				disks[n-1].name = pp->lg_name;
-				humanize_number(diskdesc, 7, pp->lg_mediasize,
-				    "B", HN_AUTOSCALE, HN_DECIMAL);
-				if (strncmp(pp->lg_name, "ad", 2) == 0)
-					strcat(diskdesc, " ATA Hard Disk");
-				else if (strncmp(pp->lg_name, "md", 2) == 0)
-					strcat(diskdesc, " Memory Disk");
-				else
-					strcat(diskdesc, " Disk");
-
-				if (desc != NULL)
-					snprintf(diskdesc, sizeof(diskdesc),
-					    "%s <%s>", diskdesc, desc);
-
-				disks[n-1].text = strdup(diskdesc);
-				disks[n-1].help = NULL;
-				disks[n-1].state = 0;
-			}
-		}
-	}
-
-	if (n > 1) {
-		err = dlg_menu("Partitioning",
-		    "Select the disk on which to install FreeBSD.", 0, 0, 0,
-		    n, disks, &selected, NULL);
-
-		chosen = (err == 0) ? strdup(disks[selected].name) : NULL;
-	} else if (n == 1) {
-		chosen = strdup(disks[0].name);
-	} else {
-		chosen = NULL;
-	}
-
-	for (i = 0; i < n; i++)
-		free(disks[i].text);
-
-	return (chosen);
-}
-
-static struct gprovider *
-provider_for_name(struct gmesh *mesh, const char *name)
-{
-	struct gclass *classp;
-	struct gprovider *pp = NULL;
-	struct ggeom *gp;
-
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
-		LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
-			if (LIST_EMPTY(&gp->lg_provider))
-				continue;
-
-			LIST_FOREACH(pp, &gp->lg_provider, lg_provider)
-				if (strcmp(pp->lg_name, name) == 0)
-					break;
-
-			if (pp != NULL) break;
-		}
-
-		if (pp != NULL) break;
-	}
-
-	return (pp);
-}
-
-static char *
-wizard_partition(struct gmesh *mesh, const char *disk)
-{
-	struct gclass *classp;
-	struct ggeom *gpart = NULL;
-	struct gconfig *gc;
-	char *retval = NULL;
-	const char *scheme = NULL;
-	char message[512];
-	int choice;
-
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class)
-		if (strcmp(classp->lg_name, "PART") == 0)
-			break;
-
-	if (classp != NULL) {
-		LIST_FOREACH(gpart, &classp->lg_geom, lg_geom)
-			if (strcmp(gpart->lg_name, disk) == 0)
-				break;
-	}
-
-	if (gpart != NULL) {
-		LIST_FOREACH(gc, &gpart->lg_config, lg_config) {
-			if (strcmp(gc->lg_name, "scheme") == 0) {
-				scheme = gc->lg_val;
-				break;
-			}
-		}
-	}
-
-	/* Treat uncommitted scheme deletions as no scheme */
-	if (scheme != NULL && strcmp(scheme, "(none)") == 0)
-		scheme = NULL;
-
-query:
-	dialog_vars.yes_label = "Entire Disk";
-	dialog_vars.no_label = "Partition";
-	if (gpart != NULL)
-		dialog_vars.defaultno = TRUE;
-
-	snprintf(message, sizeof(message), "Would you like to use this entire "
-	    "disk (%s) for FreeBSD or partition it to share it with other "
-	    "operating systems? Using the entire disk will erase any data "
-	    "currently stored there.", disk);
-	choice = dialog_yesno("Partition", message, 0, 0);
-
-	dialog_vars.yes_label = NULL;
-	dialog_vars.no_label = NULL;
-	dialog_vars.defaultno = FALSE;
-
-	if (choice == 1 && scheme != NULL && !is_scheme_bootable(scheme)) {
-		char warning[512];
-		int subchoice;
-
-		sprintf(warning, "The existing partition scheme on this "
-		    "disk (%s) is not bootable on this platform. To install "
-		    "FreeBSD, it must be repartitioned. This will destroy all "
-		    "data on the disk. Are you sure you want to proceed?",
-		    scheme);
-		subchoice = dialog_yesno("Non-bootable Disk", warning, 0, 0);
-		if (subchoice != 0)
-			goto query;
-
-		gpart_destroy(gpart);
-		scheme = choose_part_type(default_scheme());
-		if (scheme == NULL)
-			return NULL;
-		gpart_partition(disk, scheme);
-	}
-
-	if (scheme == NULL || choice == 0) {
-		if (gpart != NULL && scheme != NULL) {
-			/* Erase partitioned disk */
-			choice = dialog_yesno("Confirmation", "This will erase "
-			   "the disk. Are you sure you want to proceed?", 0, 0);
-			if (choice != 0)
-				goto query;
-
-			gpart_destroy(gpart);
-		}
-
-		scheme = choose_part_type(default_scheme());
-		if (scheme == NULL)
-			return NULL;
-		gpart_partition(disk, scheme);
-	}
-
-	if (strcmp(scheme, "MBR") == 0) {
-		struct gmesh submesh;
-		geom_gettree(&submesh);
-		gpart_create(provider_for_name(&submesh, disk),
-		    "freebsd", NULL, NULL, &retval,
-		    choice /* Non-interactive for "Entire Disk" */);
-		geom_deletetree(&submesh);
-	} else {
-		retval = strdup(disk);
-	}
-
-	return (retval);
-}
-
-int
-wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype,
-    int interactive)
-{
-	struct gclass *classp;
-	struct ggeom *gp;
-	struct gprovider *pp;
-	char *fsnames[] = {"freebsd-ufs", "freebsd-zfs"};
-	char *fsname;
-	struct gmesh submesh;
-	char swapsizestr[10], rootsizestr[10];
-	intmax_t swapsize, available;
-	int retval;
-
-	if (strcmp(fstype, "zfs") == 0) {
-		fsname = fsnames[1];
-	} else {
-		/* default to UFS */
-		fsname = fsnames[0];
-	}
-
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class)
-		if (strcmp(classp->lg_name, "PART") == 0)
-			break;
-
-	LIST_FOREACH(gp, &classp->lg_geom, lg_geom)
-		if (strcmp(gp->lg_name, disk) == 0)
-			break;
-
-	pp = provider_for_name(mesh, disk);
-
-	available = gpart_max_free(gp, NULL)*pp->lg_sectorsize;
-	if (interactive && available < MIN_FREE_SPACE) {
-		char availablestr[10], neededstr[10], message[512];
-		humanize_number(availablestr, 7, available, "B", HN_AUTOSCALE,
-		    HN_DECIMAL);
-		humanize_number(neededstr, 7, MIN_FREE_SPACE, "B", HN_AUTOSCALE,
-		    HN_DECIMAL);
-		sprintf(message, "There is not enough free space on %s to "
-		    "install FreeBSD (%s free, %s required). Would you like "
-		    "to choose another disk or to open the partition editor?",
-		    disk, availablestr, neededstr);
-
-		dialog_vars.yes_label = "Another Disk";
-		dialog_vars.no_label = "Editor";
-		retval = dialog_yesno("Warning", message, 0, 0);
-		dialog_vars.yes_label = NULL;
-		dialog_vars.no_label = NULL;
-
-		return (!retval); /* Editor -> return 0 */
-	}
-
-	swapsize = SWAP_SIZE(available);
-	humanize_number(swapsizestr, 7, swapsize, "B", HN_AUTOSCALE,
-	    HN_NOSPACE | HN_DECIMAL);
-	humanize_number(rootsizestr, 7, available - swapsize - 1024*1024,
-	    "B", HN_AUTOSCALE, HN_NOSPACE | HN_DECIMAL);
-
-	geom_gettree(&submesh);
-	pp = provider_for_name(&submesh, disk);
-	gpart_create(pp, fsname, rootsizestr, "/", NULL, 0);
-	geom_deletetree(&submesh);
-
-	geom_gettree(&submesh);
-	pp = provider_for_name(&submesh, disk);
-	gpart_create(pp, "freebsd-swap", swapsizestr, NULL, NULL, 0);
-	geom_deletetree(&submesh);
-
-	return (0);
-}
diff --git a/bsdinstall/partedit/partedit.c b/bsdinstall/partedit/partedit.c
deleted file mode 100644
index df7e573d42c2..000000000000
--- a/bsdinstall/partedit/partedit.c
+++ /dev/null
@@ -1,606 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-
-#include <dialog.h>
-#include <dlg_keys.h>
-#include <err.h>
-#include <errno.h>
-#include <fstab.h>
-#include <inttypes.h>
-#include <libgeom.h>
-#include <libutil.h>
-#include <stdlib.h>
-#include <sysexits.h>
-
-#include "diskmenu.h"
-#include "partedit.h"
-
-struct pmetadata_head part_metadata;
-static int sade_mode = 0;
-
-static int apply_changes(struct gmesh *mesh);
-static void apply_workaround(struct gmesh *mesh);
-static struct partedit_item *read_geom_mesh(struct gmesh *mesh, int *nitems);
-static void add_geom_children(struct ggeom *gp, int recurse,
-    struct partedit_item **items, int *nitems);
-static void init_fstab_metadata(void);
-static void get_mount_points(struct partedit_item *items, int nitems);
-static int validate_setup(void);
-
-static void
-sigint_handler(int sig)
-{
-	struct gmesh mesh;
-
-	/* Revert all changes and exit dialog-mode cleanly on SIGINT */
-	geom_gettree(&mesh);
-	gpart_revert_all(&mesh);
-	geom_deletetree(&mesh);
-
-	end_dialog();
-
-	exit(1);
-}
-
-int
-main(int argc, const char **argv)
-{
-	struct partition_metadata *md;
-	const char *progname, *prompt;
-	struct partedit_item *items = NULL;
-	struct gmesh mesh;
-	int i, op, nitems;
-	int error;
-
-	progname = getprogname();
-	if (strcmp(progname, "sade") == 0)
-		sade_mode = 1;
-
-	TAILQ_INIT(&part_metadata);
-
-	init_fstab_metadata();
-
-	init_dialog(stdin, stdout);
-	if (!sade_mode)
-		dialog_vars.backtitle = __DECONST(char *, "FreeBSD Installer");
-	dialog_vars.item_help = TRUE;
-	i = 0;
-
-	/* Revert changes on SIGINT */
-	signal(SIGINT, sigint_handler);
-
-	if (strcmp(progname, "autopart") == 0) { /* Guided */
-		prompt = "Please review the disk setup. When complete, press "
-		    "the Finish button.";
-		/* Experimental ZFS autopartition support */
-		if (argc > 1 && strcmp(argv[1], "zfs") == 0) {
-			part_wizard("zfs");
-		} else {
-			part_wizard("ufs");
-		}
-	} else if (strcmp(progname, "scriptedpart") == 0) {
-		error = scripted_editor(argc, argv);
-		prompt = NULL;
-		if (error != 0) {
-			end_dialog();
-			return (error);
-		}
-	} else {
-		prompt = "Create partitions for FreeBSD. No changes will be "
-		    "made until you select Finish.";
-	}
-
-	/* Show the part editor either immediately, or to confirm wizard */
-	while (prompt != NULL) {
-		dlg_clear();
-		dlg_put_backtitle();
-
-		error = geom_gettree(&mesh);
-		if (error == 0)
-			items = read_geom_mesh(&mesh, &nitems);
-		if (error || items == NULL) {
-			dialog_msgbox("Error", "No disks found. If you need to "
-			    "install a kernel driver, choose Shell at the "
-			    "installation menu.", 0, 0, TRUE);
-			break;
-		}
-			
-		get_mount_points(items, nitems);
-
-		if (i >= nitems)
-			i = nitems - 1;
-		end_dialog();op = diskmenu_show("Partition Editor", prompt,
-		    items, nitems, &i);init_dialog(stdin, stdout);
-
-		switch (op) {
-		case 0: /* Create */
-			gpart_create((struct gprovider *)(items[i].cookie),
-			    NULL, NULL, NULL, NULL, 1);
-			break;
-		case 1: /* Delete */
-			gpart_delete((struct gprovider *)(items[i].cookie));
-			break;
-		case 2: /* Modify */
-			gpart_edit((struct gprovider *)(items[i].cookie));
-			break;
-		case 3: /* Revert */
-			gpart_revert_all(&mesh);
-			while ((md = TAILQ_FIRST(&part_metadata)) != NULL) {
-				if (md->fstab != NULL) {
-					free(md->fstab->fs_spec);
-					free(md->fstab->fs_file);
-					free(md->fstab->fs_vfstype);
-					free(md->fstab->fs_mntops);
-					free(md->fstab->fs_type);
-					free(md->fstab);
-				}
-				if (md->newfs != NULL)
-					free(md->newfs);
-				free(md->name);
-
-				TAILQ_REMOVE(&part_metadata, md, metadata);
-				free(md);
-			}
-			init_fstab_metadata();
-			break;
-		case 4: /* Auto */
-			part_wizard("ufs");
-			break;
-		}
-
-		error = 0;
-		if (op == 5) { /* Finished */
-			dialog_vars.ok_label = __DECONST(char *, "Commit");
-			dialog_vars.extra_label =
-			    __DECONST(char *, "Revert & Exit");
-			dialog_vars.extra_button = TRUE;
-			dialog_vars.cancel_label = __DECONST(char *, "Back");
-			op = dialog_yesno("Confirmation", "Your changes will "
-			    "now be written to disk. If you have chosen to "
-			    "overwrite existing data, it will be PERMANENTLY "
-			    "ERASED. Are you sure you want to commit your "
-			    "changes?", 0, 0);
-			dialog_vars.ok_label = NULL;
-			dialog_vars.extra_button = FALSE;
-			dialog_vars.cancel_label = NULL;
-
-			if (op == 0 && validate_setup()) { /* Save */
-				error = apply_changes(&mesh);
-				if (!error)
-					apply_workaround(&mesh);
-				break;
-			} else if (op == 3) { /* Quit */
-				gpart_revert_all(&mesh);
-				error =	-1;
-				break;
-			}
-		}
-
-		geom_deletetree(&mesh);
-		free(items);
-	}
-	
-	if (prompt == NULL) {
-		error = geom_gettree(&mesh);
-		if (validate_setup()) {
-			error = apply_changes(&mesh);
-		} else {
-			gpart_revert_all(&mesh);
-			error = -1;
-		}
-	}
-
-	geom_deletetree(&mesh);
-	free(items);
-	end_dialog();
-
-	return (error);
-}
-
-struct partition_metadata *
-get_part_metadata(const char *name, int create)
-{
-	struct partition_metadata *md;
-
-	TAILQ_FOREACH(md, &part_metadata, metadata) 
-		if (md->name != NULL && strcmp(md->name, name) == 0)
-			break;
-
-	if (md == NULL && create) {
-		md = calloc(1, sizeof(*md));
-		md->name = strdup(name);
-		TAILQ_INSERT_TAIL(&part_metadata, md, metadata);
-	}
-
-	return (md);
-}
-	
-void
-delete_part_metadata(const char *name)
-{
-	struct partition_metadata *md;
-
-	TAILQ_FOREACH(md, &part_metadata, metadata) {
-		if (md->name != NULL && strcmp(md->name, name) == 0) {
-			if (md->fstab != NULL) {
-				free(md->fstab->fs_spec);
-				free(md->fstab->fs_file);
-				free(md->fstab->fs_vfstype);
-				free(md->fstab->fs_mntops);
-				free(md->fstab->fs_type);
-				free(md->fstab);
-			}
-			if (md->newfs != NULL)
-				free(md->newfs);
-			free(md->name);
-
-			TAILQ_REMOVE(&part_metadata, md, metadata);
-			free(md);
-			break;
-		}
-	}
-}
-
-static int
-validate_setup(void)
-{
-	struct partition_metadata *md, *root = NULL;
-	int cancel;
-
-	TAILQ_FOREACH(md, &part_metadata, metadata) {
-		if (md->fstab != NULL && strcmp(md->fstab->fs_file, "/") == 0)
-			root = md;
-
-		/* XXX: Check for duplicate mountpoints */
-	}
-
-	if (root == NULL) {
-		dialog_msgbox("Error", "No root partition was found. "
-		    "The root FreeBSD partition must have a mountpoint of '/'.",
-		0, 0, TRUE);
-		return (FALSE);
-	}
-
-	/*
-	 * Check for root partitions that we aren't formatting, which is 
-	 * usually a mistake
-	 */
-	if (root->newfs == NULL && !sade_mode) {
-		dialog_vars.defaultno = TRUE;
-		cancel = dialog_yesno("Warning", "The chosen root partition "
-		    "has a preexisting filesystem. If it contains an existing "
-		    "FreeBSD system, please update it with freebsd-update "
-		    "instead of installing a new system on it. The partition "
-		    "can also be erased by pressing \"No\" and then deleting "
-		    "and recreating it. Are you sure you want to proceed?",
-		    0, 0);
-		dialog_vars.defaultno = FALSE;
-		if (cancel)
-			return (FALSE);
-	}
-
-	return (TRUE);
-}
-
-static int
-mountpoint_sorter(const void *xa, const void *xb)
-{
-	struct partition_metadata *a = *(struct partition_metadata **)xa;
-	struct partition_metadata *b = *(struct partition_metadata **)xb;
-
-	if (a->fstab == NULL && b->fstab == NULL)
-		return 0;
-	if (a->fstab == NULL)
-		return 1;
-	if (b->fstab == NULL)
-		return -1;
-
-	return strcmp(a->fstab->fs_file, b->fstab->fs_file);
-}
-
-static int
-apply_changes(struct gmesh *mesh)
-{
-	struct partition_metadata *md;
-	char message[512];
-	int i, nitems, error;
-	const char **items;
-	const char *fstab_path;
-	FILE *fstab;
-
-	nitems = 1; /* Partition table changes */
-	TAILQ_FOREACH(md, &part_metadata, metadata) {
-		if (md->newfs != NULL)
-			nitems++;
-	}
-	items = calloc(nitems * 2, sizeof(const char *));
-	items[0] = "Writing partition tables";
-	items[1] = "7"; /* In progress */
-	i = 1;
-	TAILQ_FOREACH(md, &part_metadata, metadata) {
-		if (md->newfs != NULL) {
-			char *item;
-			item = malloc(255);
-			sprintf(item, "Initializing %s", md->name);
-			items[i*2] = item;
-			items[i*2 + 1] = "Pending";
-			i++;
-		}
-	}
-
-	i = 0;
-	dialog_mixedgauge("Initializing",
-	    "Initializing file systems. Please wait.", 0, 0, i*100/nitems,
-	    nitems, __DECONST(char **, items));
-	gpart_commit(mesh);
-	items[i*2 + 1] = "3";
-	i++;
-
-	if (getenv("BSDINSTALL_LOG") == NULL) 
-		setenv("BSDINSTALL_LOG", "/dev/null", 1);
-
-	TAILQ_FOREACH(md, &part_metadata, metadata) {
-		if (md->newfs != NULL) {
-			items[i*2 + 1] = "7"; /* In progress */
-			dialog_mixedgauge("Initializing",
-			    "Initializing file systems. Please wait.", 0, 0,
-			    i*100/nitems, nitems, __DECONST(char **, items));
-			sprintf(message, "(echo %s; %s) >>%s 2>>%s",
-			    md->newfs, md->newfs, getenv("BSDINSTALL_LOG"),
-			    getenv("BSDINSTALL_LOG"));
-			error = system(message);
-			items[i*2 + 1] = (error == 0) ? "3" : "1";
-			i++;
-		}
-	}
-	dialog_mixedgauge("Initializing",
-	    "Initializing file systems. Please wait.", 0, 0,
-	    i*100/nitems, nitems, __DECONST(char **, items));
-
-	for (i = 1; i < nitems; i++)
-		free(__DECONST(char *, items[i*2]));
-	free(items);
-
-	/* Sort filesystems for fstab so that mountpoints are ordered */
-	{
-		struct partition_metadata **tobesorted;
-		struct partition_metadata *tmp;
-		int nparts = 0;
-		TAILQ_FOREACH(md, &part_metadata, metadata)
-			nparts++;
-		tobesorted = malloc(sizeof(struct partition_metadata *)*nparts);
-		nparts = 0;
-		TAILQ_FOREACH_SAFE(md, &part_metadata, metadata, tmp) {
-			tobesorted[nparts++] = md;
-			TAILQ_REMOVE(&part_metadata, md, metadata);
-		}
-		qsort(tobesorted, nparts, sizeof(tobesorted[0]),
-		    mountpoint_sorter);
-
-		/* Now re-add everything */
-		while (nparts-- > 0)
-			TAILQ_INSERT_HEAD(&part_metadata,
-			    tobesorted[nparts], metadata);
-		free(tobesorted);
-	}
-
-	if (getenv("PATH_FSTAB") != NULL)
-		fstab_path = getenv("PATH_FSTAB");
-	else
-		fstab_path = "/etc/fstab";
-	fstab = fopen(fstab_path, "w+");
-	if (fstab == NULL) {
-		sprintf(message, "Cannot open fstab file %s for writing (%s)\n",
-		    getenv("PATH_FSTAB"), strerror(errno));
-		dialog_msgbox("Error", message, 0, 0, TRUE);
-		return (-1);
-	}
-	fprintf(fstab, "# Device\tMountpoint\tFStype\tOptions\tDump\tPass#\n");
-	TAILQ_FOREACH(md, &part_metadata, metadata) {
-		if (md->fstab != NULL)
-			fprintf(fstab, "%s\t%s\t\t%s\t%s\t%d\t%d\n",
-			    md->fstab->fs_spec, md->fstab->fs_file,
-			    md->fstab->fs_vfstype, md->fstab->fs_mntops,
-			    md->fstab->fs_freq, md->fstab->fs_passno);
-	}
-	fclose(fstab);
-
-	return (0);
-}
-
-static void
-apply_workaround(struct gmesh *mesh)
-{
-	struct gclass *classp;
-	struct ggeom *gp;
-	struct gconfig *gc;
-	const char *scheme = NULL, *modified = NULL;
-
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
-		if (strcmp(classp->lg_name, "PART") == 0)
-			break;
-	}
-
-	if (strcmp(classp->lg_name, "PART") != 0) {
-		dialog_msgbox("Error", "gpart not found!", 0, 0, TRUE);
-		return;
-	}
-
-	LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
-		LIST_FOREACH(gc, &gp->lg_config, lg_config) {
-			if (strcmp(gc->lg_name, "scheme") == 0) {
-				scheme = gc->lg_val;
-			} else if (strcmp(gc->lg_name, "modified") == 0) {
-				modified = gc->lg_val;
-			}
-		}
-
-		if (scheme && strcmp(scheme, "GPT") == 0 &&
-		    modified && strcmp(modified, "true") == 0) {
-			if (getenv("WORKAROUND_LENOVO"))
-				gpart_set_root(gp->lg_name, "lenovofix");
-			if (getenv("WORKAROUND_GPTACTIVE"))
-				gpart_set_root(gp->lg_name, "active");
-		}
-	}
-}
-
-static struct partedit_item *
-read_geom_mesh(struct gmesh *mesh, int *nitems)
-{
-	struct gclass *classp;
-	struct ggeom *gp;
-	struct partedit_item *items;
-
-	*nitems = 0;
-	items = NULL;
-
-	/*
-	 * Build the device table. First add all disks (and CDs).
-	 */
-	
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
-		if (strcmp(classp->lg_name, "DISK") != 0 &&
-		    strcmp(classp->lg_name, "MD") != 0)
-			continue;
-
-		/* Now recurse into all children */
-		LIST_FOREACH(gp, &classp->lg_geom, lg_geom) 
-			add_geom_children(gp, 0, &items, nitems);
-	}
-
-	return (items);
-}
-
-static void
-add_geom_children(struct ggeom *gp, int recurse, struct partedit_item **items,
-    int *nitems)
-{
-	struct gconsumer *cp;
-	struct gprovider *pp;
-	struct gconfig *gc;
-
-	if (strcmp(gp->lg_class->lg_name, "PART") == 0 &&
-	    !LIST_EMPTY(&gp->lg_config)) {
-		LIST_FOREACH(gc, &gp->lg_config, lg_config) {
-			if (strcmp(gc->lg_name, "scheme") == 0)
-				(*items)[*nitems-1].type = gc->lg_val;
-		}
-	}
-
-	if (LIST_EMPTY(&gp->lg_provider)) 
-		return;
-
-	LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
-		if (strcmp(gp->lg_class->lg_name, "LABEL") == 0)
-			continue;
-
-		/* Skip WORM media */
-		if (strncmp(pp->lg_name, "cd", 2) == 0)
-			continue;
-
-		*items = realloc(*items,
-		    (*nitems+1)*sizeof(struct partedit_item));
-		(*items)[*nitems].indentation = recurse;
-		(*items)[*nitems].name = pp->lg_name;
-		(*items)[*nitems].size = pp->lg_mediasize;
-		(*items)[*nitems].mountpoint = NULL;
-		(*items)[*nitems].type = "";
-		(*items)[*nitems].cookie = pp;
-
-		LIST_FOREACH(gc, &pp->lg_config, lg_config) {
-			if (strcmp(gc->lg_name, "type") == 0)
-				(*items)[*nitems].type = gc->lg_val;
-		}
-
-		/* Skip swap-backed MD devices */
-		if (strcmp(gp->lg_class->lg_name, "MD") == 0 &&
-		    strcmp((*items)[*nitems].type, "swap") == 0)
-			continue;
-
-		(*nitems)++;
-
-		LIST_FOREACH(cp, &pp->lg_consumers, lg_consumers)
-			add_geom_children(cp->lg_geom, recurse+1, items,
-			    nitems);
-
-		/* Only use first provider for acd */
-		if (strcmp(gp->lg_class->lg_name, "ACD") == 0)
-			break;
-	}
-}
-
-static void
-init_fstab_metadata(void)
-{
-	struct fstab *fstab;
-	struct partition_metadata *md;
-
-	setfsent();
-	while ((fstab = getfsent()) != NULL) {
-		md = calloc(1, sizeof(struct partition_metadata));
-
-		md->name = NULL;
-		if (strncmp(fstab->fs_spec, "/dev/", 5) == 0)
-			md->name = strdup(&fstab->fs_spec[5]);
-
-		md->fstab = malloc(sizeof(struct fstab));
-		md->fstab->fs_spec = strdup(fstab->fs_spec);
-		md->fstab->fs_file = strdup(fstab->fs_file);
-		md->fstab->fs_vfstype = strdup(fstab->fs_vfstype);
-		md->fstab->fs_mntops = strdup(fstab->fs_mntops);
-		md->fstab->fs_type = strdup(fstab->fs_type);
-		md->fstab->fs_freq = fstab->fs_freq;
-		md->fstab->fs_passno = fstab->fs_passno;
-
-		md->newfs = NULL;
-		
-		TAILQ_INSERT_TAIL(&part_metadata, md, metadata);
-	}
-}
-
-static void
-get_mount_points(struct partedit_item *items, int nitems)
-{
-	struct partition_metadata *md;
-	int i;
-	
-	for (i = 0; i < nitems; i++) {
-		TAILQ_FOREACH(md, &part_metadata, metadata) {
-			if (md->name != NULL && md->fstab != NULL &&
-			    strcmp(md->name, items[i].name) == 0) {
-				items[i].mountpoint = md->fstab->fs_file;
-				break;
-			}
-		}
-	}
-}
diff --git a/bsdinstall/partedit/partedit.h b/bsdinstall/partedit/partedit.h
deleted file mode 100644
index 5c0405922d21..000000000000
--- a/bsdinstall/partedit/partedit.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _PARTEDIT_PARTEDIT_H
-#define _PARTEDIT_PARTEDIT_H
-
-#include <sys/queue.h>
-#include <inttypes.h>
-#include <fstab.h>
-
-struct gprovider;
-struct gmesh;
-struct ggeom;
-
-TAILQ_HEAD(pmetadata_head, partition_metadata);
-extern struct pmetadata_head part_metadata;
-
-struct partition_metadata {
-	char *name;		/* name of this partition, as in GEOM */
-	
-	struct fstab *fstab;	/* fstab data for this partition */
-	char *newfs;		/* shell command to initialize partition */
-	
-	int bootcode;
-
-	TAILQ_ENTRY(partition_metadata) metadata;
-};
-
-struct partition_metadata *get_part_metadata(const char *name, int create);
-void delete_part_metadata(const char *name);
-
-int part_wizard(const char *fstype);
-int scripted_editor(int argc, const char **argv);
-char *boot_disk_select(struct gmesh *mesh);
-int wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype,
-    int interactive);
-
-/* gpart operations */
-void gpart_delete(struct gprovider *pp);
-void gpart_destroy(struct ggeom *lg_geom);
-void gpart_edit(struct gprovider *pp);
-void gpart_create(struct gprovider *pp, const char *default_type,
-    const char *default_size, const char *default_mountpoint,
-    char **output, int interactive);
-intmax_t gpart_max_free(struct ggeom *gp, intmax_t *start);
-void gpart_revert(struct gprovider *pp);
-void gpart_revert_all(struct gmesh *mesh);
-void gpart_commit(struct gmesh *mesh);
-int gpart_partition(const char *lg_name, const char *scheme);
-void set_default_part_metadata(const char *name, const char *scheme,
-    const char *type, const char *mountpoint, const char *newfs);
-void gpart_set_root(const char *lg_name, const char *attribute);
-const char *choose_part_type(const char *def_scheme);
-
-/* machine-dependent bootability checks */
-const char *default_scheme(void);		/* Default partition scheme */
-int is_scheme_bootable(const char *scheme);	/* Non-zero if scheme boots */
-int is_fs_bootable(const char *scheme, const char *fs); /* Ditto if FS boots */
-
-/* Size of boot partition in bytes. Zero if no boot partition */
-size_t bootpart_size(const char *scheme);
-
-/*
- * Type and mountpoint of boot partition for given scheme. If boot partition
- * should not be mounted, set mountpoint to NULL or leave it unchanged.
- * Note that mountpoint non-NULL implies partcode_path() will be ignored.
- * Do *NOT* set both!
- */
-const char *bootpart_type(const char *scheme, const char **mountpoint);
-
-/* Path to bootcode that goes in the scheme (e.g. disk MBR). NULL if none */
-const char *bootcode_path(const char *scheme);
-
-/*
- * Path to boot blocks to be dd'ed into the partition suggested by bootpart_*
- * for the given scheme and root filesystem type. If the boot partition should
- * be mounted rather than dd'ed to, return NULL here.
- */
-const char *partcode_path(const char *scheme, const char *fs_type);
-
-#endif
diff --git a/bsdinstall/partedit/partedit_efi.c b/bsdinstall/partedit/partedit_efi.c
deleted file mode 100644
index 074475e07152..000000000000
--- a/bsdinstall/partedit/partedit_efi.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2016 Cavium Inc.
- * All rights reserved.
- *
- * Developed by Semihalf.
- * Based on work by Nathan Whitehorn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/types.h>
-#include <string.h>
-
-#include "partedit.h"
-
-/*
- * partedit implementation for platforms on which the installer only offers
- * UEFI-based boot. Currently, this includes arm64 and RISC-V.
- */
-
-/* EFI partition size in bytes */
-#define	EFI_BOOTPART_SIZE	(260 * 1024 * 1024)
-
-const char *
-default_scheme(void)
-{
-
-	return ("GPT");
-}
-
-int
-is_scheme_bootable(const char *part_type)
-{
-
-	if (strcmp(part_type, "GPT") == 0)
-		return (1);
-
-	return (0);
-}
-
-int
-is_fs_bootable(const char *part_type, const char *fs)
-{
-
-	if (strcmp(fs, "freebsd-ufs") == 0)
-		return (1);
-
-	return (0);
-}
-
-size_t
-bootpart_size(const char *scheme)
-{
-
-	/* We only support GPT with EFI */
-	if (strcmp(scheme, "GPT") != 0)
-		return (0);
-
-	return (EFI_BOOTPART_SIZE);
-}
-
-const char *
-bootpart_type(const char *scheme, const char **mountpoint)
-{
-
-	/* Only EFI is supported as boot partition */
-	*mountpoint = "/boot/efi";
-	return ("efi");
-}
-
-const char *
-bootcode_path(const char *part_type)
-{
-
-	return (NULL);
-}
-
-const char *
-partcode_path(const char *part_type, const char *fs_type)
-{
-
-	/* No boot partition data. */
-	return (NULL);
-}
-
diff --git a/bsdinstall/partedit/partedit_generic.c b/bsdinstall/partedit/partedit_generic.c
deleted file mode 100644
index e25784592a9b..000000000000
--- a/bsdinstall/partedit/partedit_generic.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <string.h>
-
-#include "partedit.h"
-
-const char *
-default_scheme(void) {
-	/*
-	 * Our loader can parse GPT, so pick that as the default for lack of
-	 * a better idea.
-	 */
-
-	return ("GPT");
-}
-
-int
-is_scheme_bootable(const char *part_type) {
-	/*
-	 * We don't know anything about this platform, so don't irritate the
-	 * user by claiming the chosen partition scheme isn't bootable.
-	 */
-
-	return (1);
-}
-
-int
-is_fs_bootable(const char *part_type, const char *fs) {
-	return (1);
-}
-
-/* No clue => no boot partition, bootcode, or partcode */
-
-size_t
-bootpart_size(const char *part_type) {
-	return (0);
-}
-
-const char *
-bootpart_type(const char *scheme, const char **mountpoint) {
-	return ("freebsd-boot");
-}
-
-const char *
-bootcode_path(const char *part_type) {
-	return (NULL);
-}
-	
-const char *
-partcode_path(const char *part_type, const char *fs_type) {
-	return (NULL);
-}
-
diff --git a/bsdinstall/partedit/partedit_powerpc.c b/bsdinstall/partedit/partedit_powerpc.c
deleted file mode 100644
index 5a3041df5b0c..000000000000
--- a/bsdinstall/partedit/partedit_powerpc.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <string.h>
-
-#include "partedit.h"
-
-static char platform[255] = "";
-
-const char *
-default_scheme(void) {
-	size_t platlen = sizeof(platform);
-	if (strlen(platform) == 0)
-		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
-
-	if (strcmp(platform, "powermac") == 0)
-		return ("APM");
-	if (strcmp(platform, "chrp") == 0 || strcmp(platform, "ps3") == 0 ||
-	    strcmp(platform, "mpc85xx") == 0)
-		return ("MBR");
-
-	/* Pick GPT as a generic default */
-	return ("GPT");
-}
-
-int
-is_scheme_bootable(const char *part_type) {
-	size_t platlen = sizeof(platform);
-	if (strlen(platform) == 0)
-		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
-
-	if (strcmp(platform, "powermac") == 0 && strcmp(part_type, "APM") == 0)
-		return (1);
-	if (strcmp(platform, "powernv") == 0 && strcmp(part_type, "GPT") == 0)
-		return (1);
-	if ((strcmp(platform, "chrp") == 0 || strcmp(platform, "ps3") == 0) &&
-	    (strcmp(part_type, "MBR") == 0 || strcmp(part_type, "BSD") == 0 ||
-	     strcmp(part_type, "GPT") == 0))
-		return (1);
-	if (strcmp(platform, "mpc85xx") == 0 && strcmp(part_type, "MBR") == 0)
-		return (1);
-
-	return (0);
-}
-
-int
-is_fs_bootable(const char *part_type, const char *fs)
-{
-	if (strcmp(fs, "freebsd-ufs") == 0)
-		return (1);
-	
-	return (0);
-}
-
-size_t
-bootpart_size(const char *part_type)
-{
-	size_t platlen = sizeof(platform);
-	if (strlen(platform) == 0)
-		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
-
-	if (strcmp(part_type, "APM") == 0)
-		return (800*1024);
-	if (strcmp(part_type, "BSD") == 0) /* Nothing for nested */
-		return (0);
-	if (strcmp(platform, "chrp") == 0)
-		return (800*1024);
-	if (strcmp(platform, "ps3") == 0 || strcmp(platform, "powernv") == 0)
-		return (512*1024*1024);
-	if (strcmp(platform, "mpc85xx") == 0)
-		return (16*1024*1024);
-	return (0);
-}
-
-const char *
-bootpart_type(const char *scheme, const char **mountpoint)
-{
-	size_t platlen = sizeof(platform);
-	if (strlen(platform) == 0)
-		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
-
-	if (strcmp(platform, "chrp") == 0)
-		return ("prep-boot");
-	if (strcmp(platform, "powermac") == 0)
-		return ("apple-boot");
-	if (strcmp(platform, "powernv") == 0 || strcmp(platform, "ps3") == 0) {
-		*mountpoint = "/boot";
-		if (strcmp(scheme, "GPT") == 0)
-			return ("ms-basic-data");
-		else if (strcmp(scheme, "MBR") == 0)
-			return ("fat32");
-	}
-	if (strcmp(platform, "mpc85xx") == 0) {
-		*mountpoint = "/boot/uboot";
-		return ("fat16");
-	}
-
-	return ("freebsd-boot");
-}
-
-const char *
-bootcode_path(const char *part_type) {
-	return (NULL);
-}
-	
-const char *
-partcode_path(const char *part_type, const char *fs_type) {
-	size_t platlen = sizeof(platform);
-	if (strlen(platform) == 0)
-		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
-
-	if (strcmp(part_type, "APM") == 0)
-		return ("/boot/boot1.hfs");
-	if (strcmp(platform, "chrp") == 0)
-		return ("/boot/boot1.elf");
-	return (NULL);
-}
-
diff --git a/bsdinstall/partedit/partedit_x86.c b/bsdinstall/partedit/partedit_x86.c
deleted file mode 100644
index 6983188ba34f..000000000000
--- a/bsdinstall/partedit/partedit_x86.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2011 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <string.h>
-
-#include "partedit.h"
-
-/* EFI partition size in bytes */
-#define	EFI_BOOTPART_SIZE	(260 * 1024 * 1024)
-
-static const char *
-x86_bootmethod(void)
-{
-	static char fw[255] = "";
-	size_t len = sizeof(fw);
-	int error;
-	
-	if (strlen(fw) == 0) {
-		error = sysctlbyname("machdep.bootmethod", fw, &len, NULL, -1);
-		if (error != 0)
-			return ("BIOS");
-	}
-
-	return (fw);
-}
-
-const char *
-default_scheme(void)
-{
-	if (strcmp(x86_bootmethod(), "UEFI") == 0)
-		return ("GPT");
-	else
-		return ("MBR");
-}
-
-int
-is_scheme_bootable(const char *part_type)
-{
-
-	if (strcmp(part_type, "GPT") == 0)
-		return (1);
-	if (strcmp(x86_bootmethod(), "BIOS") == 0) {
-		if (strcmp(part_type, "BSD") == 0)
-			return (1);
-		if (strcmp(part_type, "MBR") == 0)
-			return (1);
-	}
-
-	return (0);
-}
-
-int
-is_fs_bootable(const char *part_type, const char *fs)
-{
-
-	if (strcmp(fs, "freebsd-ufs") == 0)
-		return (1);
-
-	if (strcmp(fs, "freebsd-zfs") == 0 &&
-	    strcmp(part_type, "GPT") == 0 &&
-	    strcmp(x86_bootmethod(), "BIOS") == 0)
-		return (1);
-
-	return (0);
-}
-
-size_t
-bootpart_size(const char *scheme)
-{
-
-	/* No partcode except for GPT */
-	if (strcmp(scheme, "GPT") != 0)
-		return (0);
-
-	if (strcmp(x86_bootmethod(), "BIOS") == 0)
-		return (512*1024);
-	else 
-		return (EFI_BOOTPART_SIZE);
-
-	return (0);
-}
-
-const char *
-bootpart_type(const char *scheme, const char **mountpoint)
-{
-
-	if (strcmp(x86_bootmethod(), "UEFI") == 0) {
-		*mountpoint = "/boot/efi";
-		return ("efi");
-	}
-
-	return ("freebsd-boot");
-}
-
-const char *
-bootcode_path(const char *part_type)
-{
-
-	if (strcmp(x86_bootmethod(), "UEFI") == 0)
-		return (NULL);
-
-	if (strcmp(part_type, "GPT") == 0)
-		return ("/boot/pmbr");
-	if (strcmp(part_type, "MBR") == 0)
-		return ("/boot/mbr");
-	if (strcmp(part_type, "BSD") == 0)
-		return ("/boot/boot");
-
-	return (NULL);
-}
-	
-const char *
-partcode_path(const char *part_type, const char *fs_type)
-{
-
-	if (strcmp(part_type, "GPT") == 0 && strcmp(x86_bootmethod(), "UEFI") != 0) {
-		if (strcmp(fs_type, "zfs") == 0)
-			return ("/boot/gptzfsboot");
-		else
-			return ("/boot/gptboot");
-	}
-	
-	/* No partcode except for non-UEFI GPT */
-	return (NULL);
-}
-
diff --git a/bsdinstall/partedit/sade.8 b/bsdinstall/partedit/sade.8
deleted file mode 100644
index f80f8c5fb7d0..000000000000
--- a/bsdinstall/partedit/sade.8
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Copyright (c) 1997
-.\"	Jordan Hubbard <jkh@FreeBSD.org>.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Jordan Hubbard AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL Jordan Hubbard OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd December 30, 2012
-.Dt SADE 8
-.Os
-.Sh NAME
-.Nm sade
-.Nd sysadmins disk editor
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-The
-.Nm
-utility is used for various disk administration tasks on
-.Fx
-systems.
-.Pp
-It is generally invoked without arguments for the default
-behavior, where the main menu is presented.
-.Sh NOTES
-The
-.Nm
-utility aims to provide a handy tool for disk management
-tasks on an already installed system.
-The goal is to provide the same text interface for disk management in
-.Xr bsdinstall 8
-in the post-installation environment.
-.Sh SEE ALSO
-.Xr bsdinstall 8 ,
-.Xr gpart 8
-.Sh HISTORY
-A program called
-.Nm
-first appeared in
-.Fx 6.3
-as a utility encapsulating features from the
-.Xr sysinstall 8
-installer.
-It was replaced in
-.Fx 10.0
-with the equivalent part of
-.Xr bsdinstall 8 .
-.Sh AUTHORS
-.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
-.Sh BUGS
-The utility misses a lot of nice features, such as tools for
-manipulating
-.Xr gmirror 8 .
-These will be added later.
diff --git a/bsdinstall/partedit/scripted.c b/bsdinstall/partedit/scripted.c
deleted file mode 100644
index 956855eb6e54..000000000000
--- a/bsdinstall/partedit/scripted.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2013 Nathan Whitehorn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-
-#include <ctype.h>
-#include <libgeom.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "partedit.h"
-
-static struct gprovider *
-provider_for_name(struct gmesh *mesh, const char *name)
-{
-	struct gclass *classp;
-	struct gprovider *pp = NULL;
-	struct ggeom *gp;
-
-	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
-		LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
-			if (LIST_EMPTY(&gp->lg_provider))
-				continue;
-
-			LIST_FOREACH(pp, &gp->lg_provider, lg_provider)
-				if (strcmp(pp->lg_name, name) == 0)
-					break;
-
-			if (pp != NULL) break;
-		}
-
-		if (pp != NULL) break;
-	}
-
-	return (pp);
-}
-
-static int
-part_config(char *disk, const char *scheme, char *config)
-{
-	char *partition, *ap, *size = NULL, *type = NULL, *mount = NULL;
-	struct gclass *classp;
-	struct gmesh mesh;
-	struct ggeom *gpart = NULL;
-	int error;
-
-	if (scheme == NULL)
-		scheme = default_scheme();
-
-	error = geom_gettree(&mesh);
-	if (provider_for_name(&mesh, disk) == NULL) {
-		fprintf(stderr, "GEOM provider %s not found\n", disk);
-		geom_deletetree(&mesh);
-		return (-1);
-	}
-
-	/* Remove any existing partitioning and create new scheme */
-	LIST_FOREACH(classp, &mesh.lg_class, lg_class)
-		if (strcmp(classp->lg_name, "PART") == 0)
-			break;
-	if (classp != NULL) {
-		LIST_FOREACH(gpart, &classp->lg_geom, lg_geom)
-		if (strcmp(gpart->lg_name, disk) == 0)
-			break;
-	}
-	if (gpart != NULL)
-		gpart_destroy(gpart);
-	gpart_partition(disk, scheme);
-
-	if (strcmp(scheme, "MBR") == 0) {
-		struct gmesh submesh;
-		geom_gettree(&submesh);
-		gpart_create(provider_for_name(&submesh, disk),
-		    "freebsd", NULL, NULL, &disk, 0);
-		geom_deletetree(&submesh);
-	} else {
-		disk= strdup(disk);
-	}
-
-	geom_deletetree(&mesh);
-	error = geom_gettree(&mesh);
-
-	/* Create partitions */
-	if (config == NULL) {
-		wizard_makeparts(&mesh, disk, "ufs", 0);
-		goto finished;
-	}
-
-	while ((partition = strsep(&config, ",")) != NULL) {
-		while ((ap = strsep(&partition, " \t\n")) != NULL) {
-			if (*ap == '\0')
-				continue;
-			if (size == NULL)
-				size = ap;
-			else if (type == NULL)
-				type = ap;
-			else if (mount == NULL)
-				mount = ap;
-		}
-		if (size == NULL)
-			continue;
-		if (strcmp(size, "auto") == 0)
-			size = NULL;
-		gpart_create(provider_for_name(&mesh, disk), type, size, mount,
-		    NULL, 0);
-		geom_deletetree(&mesh);
-		error = geom_gettree(&mesh);
-		size = type = mount = NULL;
-	}
-
-finished:
-	geom_deletetree(&mesh);
-	free(disk);
-
-	return (0);
-}
-
-static
-int parse_disk_config(char *input)
-{
-	char *ap;
-	char *disk = NULL, *scheme = NULL, *partconfig = NULL;
-
-	while (input != NULL && *input != 0) {
-		if (isspace(*input)) {
-			input++;
-			continue;
-		}
-
-		switch(*input) {
-		case '{':
-			input++;
-			partconfig = strchr(input, '}');
-			if (partconfig == NULL) {
-				fprintf(stderr, "Malformed partition setup "
-				    "string: %s\n", input);
-				return (1);
-			}
-			*partconfig = '\0';
-			ap = partconfig+1;
-			partconfig = input;
-			input = ap;
-			break;
-		default:
-			if (disk == NULL)
-				disk = strsep(&input, " \t\n");
-			else if (scheme == NULL)
-				scheme = strsep(&input, " \t\n");
-			else {
-				fprintf(stderr, "Unknown directive: %s\n",
-				    strsep(&input, " \t\n"));
-				return (1);
-			}
-		}
-	} while (input != NULL && *input != 0);
-
-	if (disk == NULL || strcmp(disk, "DEFAULT") == 0) {
-		struct gmesh mesh;
-		geom_gettree(&mesh);
-		disk = boot_disk_select(&mesh);
-		geom_deletetree(&mesh);
-	}
-
-	return (part_config(disk, scheme, partconfig));
-}
-
-int
-scripted_editor(int argc, const char **argv)
-{
-	char *token;
-	int i, error = 0, len = 0;
-
-	for (i = 1; i < argc; i++)
-		len += strlen(argv[i]) + 1;
-	char inputbuf[len], *input = inputbuf;
-	strcpy(input, argv[1]);
-	for (i = 2; i < argc; i++) {
-		strcat(input, " ");
-		strcat(input, argv[i]);
-	}
-
-	while ((token = strsep(&input, ";")) != NULL) {
-		error = parse_disk_config(token);
-		if (error != 0)
-			return (error);
-	}
-
-	return (0);
-}
-
diff --git a/bsdinstall/scripts/Makefile b/bsdinstall/scripts/Makefile
deleted file mode 100644
index 147f49609921..000000000000
--- a/bsdinstall/scripts/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-SCRIPTS= auto adduser bootconfig checksum config docsinstall entropy \
-         fetchmissingdists hardening hostname jail keymap mirrorselect mount \
-         netconfig netconfig_ipv4 netconfig_ipv6 rootpass script services time \
-         umount wlanconfig zfsboot
-BINDIR= ${LIBEXECDIR}/bsdinstall
-
-MAN=
-
-.include <bsd.prog.mk>
diff --git a/bsdinstall/scripts/Makefile.depend b/bsdinstall/scripts/Makefile.depend
deleted file mode 100644
index f80275d86ab1..000000000000
--- a/bsdinstall/scripts/Makefile.depend
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/bsdinstall/scripts/adduser b/bsdinstall/scripts/adduser
deleted file mode 100755
index 456f76b04319..000000000000
--- a/bsdinstall/scripts/adduser
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-clear
-echo "FreeBSD Installer"
-echo "========================"
-echo "Add Users"
-echo
-chroot $BSDINSTALL_CHROOT adduser 2>&1
diff --git a/bsdinstall/scripts/auto b/bsdinstall/scripts/auto
deleted file mode 100755
index 9f8946880f61..000000000000
--- a/bsdinstall/scripts/auto
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2013-2018 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_SHARE/dialog.subr
-
-############################################################ GLOBALS
-
-#
-# Strings that should be moved to an i18n file and loaded with f_include_lang()
-#
-hline_arrows_tab_enter="Press arrows, TAB or ENTER"
-hline_arrows_tab_space_enter="Press arrows, TAB, SPACE or ENTER"
-msg_abort="Abort"
-msg_an_installation_step_has_been_aborted="An installation step has been aborted. Would you like\nto restart the installation or exit the installer?"
-msg_auto_ufs="Auto (UFS)"
-msg_auto_ufs_desc="Guided UFS Disk Setup"
-msg_auto_ufs_help="Menu options help choose which disk to setup using UFS and standard partitions"
-msg_auto_zfs="Auto (ZFS)"
-msg_auto_zfs_desc="Guided Root-on-ZFS"
-msg_auto_zfs_help="To use ZFS with less than 8GB RAM, see https://wiki.freebsd.org/ZFSTuningGuide"
-msg_exit="Exit"
-msg_freebsd_installer="FreeBSD Installer"
-msg_gpt_active_fix="Your hardware is known to have issues booting in CSM/Legacy/BIOS mode from GPT partitions that are not set active. Would you like the installer to apply this workaround for you?"
-msg_lenovo_fix="Your model of Lenovo is known to have a BIOS bug that prevents it booting from GPT partitions without UEFI. Would you like the installer to apply a workaround for you?"
-msg_manual="Manual"
-msg_manual_desc="Manual Disk Setup (experts)"
-msg_manual_help="Create customized partitions from menu options"
-msg_no="NO"
-msg_restart="Restart"
-msg_shell="Shell"
-msg_shell_desc="Open a shell and partition by hand"
-msg_shell_help="Create customized partitions using command-line utilities"
-msg_yes="YES"
-
-############################################################ FUNCTIONS
-
-# error [$msg]
-#
-# Display generic error message when a script fails. An optional message
-# argument can preceed the generic message. User is given the choice of
-# restarting the installer or exiting.
-#
-error()
-{
-	local title="$msg_abort"
-	local btitle="$msg_freebsd_installer"
-	local prompt="${1:+$1\n\n}$msg_an_installation_step_has_been_aborted"
-	local hline="$hline_arrows_tab_space_enter"
-
-	[ -f "$PATH_FSTAB" ] && bsdinstall umount
-
-	local height width
-	f_dialog_buttonbox_size height width \
-		"$title" "$btitle" "$prompt" "$hline"
-
-	if $DIALOG \
-		--title "$title"           \
-		--backtitle "$btitle"      \
-		--hline "$hline"           \
-		--no-label "$msg_exit"     \
-		--yes-label "$msg_restart" \
-		--yesno "$prompt" $height $width
-	then
-		exec $0
-		# NOTREACHED
-	fi
-	exit 1
-}
-
-# dialog_workaround
-#
-# Ask the user if they wish to apply a workaround
-#
-dialog_workaround()
-{
-	local passed_msg="$1"
-	local title="$DIALOG_TITLE"
-	local btitle="$DIALOG_BACKTITLE"
-	local prompt # Calculated below
-	local hline="$hline_arrows_tab_enter"
-
-	local height=8 width=50 prefix="   "
-	local plen=${#prefix} list= line=
-	local max_width=$(( $width - 3 - $plen ))
-
-	local yes no defaultno extra_args format
-	if [ "$USE_XDIALOG" ]; then
-		yes=ok no=cancel defaultno=default-no
-		extra_args="--wrap --left"
-		format="$passed_msg"
-	else
-		yes=yes no=no defaultno=defaultno
-		extra_args="--cr-wrap"
-		format="$passed_msg"
-	fi
-
-	# Add height for Xdialog(1)
-	[ "$USE_XDIALOG" ] && height=$(( $height + $height / 5 + 3 ))
-
-	prompt=$( printf "$format" )
-	f_dprintf "%s: Workaround prompt" "$0"
-	$DIALOG \
-		--title "$title"        \
-		--backtitle "$btitle"   \
-		--hline "$hline"        \
-		--$yes-label "$msg_yes" \
-		--$no-label "$msg_no"   \
-		$extra_args             \
-		--yesno "$prompt" $height $width
-}
-
-############################################################ MAIN
-
-f_dprintf "Began Installation at %s" "$( date )"
-
-rm -rf $BSDINSTALL_TMPETC
-mkdir $BSDINSTALL_TMPETC
-
-trap true SIGINT	# This section is optional
-bsdinstall keymap
-
-trap error SIGINT	# Catch cntrl-C here
-bsdinstall hostname || error "Set hostname failed"
-
-export DISTRIBUTIONS="base.txz kernel.txz"
-if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
-	DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
-	DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')"
-
-	if [ -n "$DISTMENU" ]; then
-		exec 3>&1
-		EXTRA_DISTS=$( eval dialog \
-		    --backtitle \"FreeBSD Installer\" \
-		    --title \"Distribution Select\" --nocancel --separate-output \
-		    --checklist \"Choose optional system components to install:\" \
-		    0 0 0 $DISTMENU \
-		2>&1 1>&3 )
-		for dist in $EXTRA_DISTS; do
-			export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
-		done
-	fi
-fi
-
-FETCH_DISTRIBUTIONS=""
-for dist in $DISTRIBUTIONS; do
-	if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then
-		FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist"
-	fi
-done
-
-if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then
-	dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0
-	bsdinstall netconfig || error
-	NETCONFIG_DONE=yes
-fi
-
-rm -f $PATH_FSTAB
-touch $PATH_FSTAB
-
-#
-# Try to detect known broken platforms and apply their workarounds
-#
-
-if f_interactive; then
-	sys_maker=$( kenv -q smbios.system.maker )
-	f_dprintf "smbios.system.maker=[%s]" "$sys_maker"
-	sys_model=$( kenv -q smbios.system.product )
-	f_dprintf "smbios.system.product=[%s]" "$sys_model"
-	sys_version=$( kenv -q smbios.system.version )
-	f_dprintf "smbios.system.version=[%s]" "$sys_version"
-	sys_mb_maker=$( kenv -q smbios.planar.maker )
-	f_dprintf "smbios.planar.maker=[%s]" "$sys_mb_maker"
-	sys_mb_product=$( kenv -q smbios.planar.product )
-	f_dprintf "smbios.planar.product=[%s]" "$sys_mb_product"
-
-	#
-	# Laptop Models
-	#
-	case "$sys_maker" in
-	"LENOVO")
-		case "$sys_version" in
-		"ThinkPad X220"|"ThinkPad T420"|"ThinkPad T520"|"ThinkPad W520"|"ThinkPad X1")
-			dialog_workaround "$msg_lenovo_fix"
-			retval=$?
-			f_dprintf "lenovofix_prompt=[%s]" "$retval"
-			if [ $retval -eq $DIALOG_OK ]; then
-				export ZFSBOOT_PARTITION_SCHEME="GPT + Lenovo Fix"
-				export WORKAROUND_LENOVO=1
-			fi
-			;;
-		esac
-		;;
-	"Dell Inc.")
-		case "$sys_model" in
-		"Latitude E6330"|"Latitude E7440"|"Latitude E7240"|"Precision Tower 5810")
-			dialog_workaround "$msg_gpt_active_fix"
-			retval=$?
-			f_dprintf "gpt_active_fix_prompt=[%s]" "$retval"
-			if [ $retval -eq $DIALOG_OK ]; then
-				export ZFSBOOT_PARTITION_SCHEME="GPT + Active"
-				export WORKAROUND_GPTACTIVE=1
-			fi
-			;;
-		esac
-		;;
-	"Hewlett-Packard")
-		case "$sys_model" in
-		"HP ProBook 4330s")
-			dialog_workaround "$msg_gpt_active_fix"
-			retval=$?
-			f_dprintf "gpt_active_fix_prompt=[%s]" "$retval"
-			if [ $retval -eq $DIALOG_OK ]; then
-				export ZFSBOOT_PARTITION_SCHEME="GPT + Active"
-				export WORKAROUND_GPTACTIVE=1
-			fi
-			;;
-		esac
-		;;
-	esac
-	#
-	# Motherboard Models
-	#
-	case "$sys_mb_maker" in
-	"Intel Corporation")
-		case "$sys_mb_product" in
-		"DP965LT"|"D510MO")
-			dialog_workaround "$msg_gpt_active_fix"
-			retval=$?
-			f_dprintf "gpt_active_fix_prompt=[%s]" "$retval"
-			if [ $retval -eq $DIALOG_OK ]; then
-				export ZFSBOOT_PARTITION_SCHEME="GPT + Active"
-				export WORKAROUND_GPTACTIVE=1
-			fi
-			;;
-		esac
-		;;
-	"Acer")
-		case "$sys_mb_product" in
-		"Veriton M6630G")
-			dialog_workaround "$msg_gpt_active_fix"
-			retval=$?
-			f_dprintf "gpt_active_fix_prompt=[%s]" "$retval"
-			if [ $retval -eq $DIALOG_OK ]; then
-				export ZFSBOOT_PARTITION_SCHEME="GPT + Active"
-				export WORKAROUND_GPTACTIVE=1
-			fi
-			;;
-		esac
-		;;
-	esac
-fi
-
-PMODES="
-	'$msg_auto_ufs' '$msg_auto_ufs_desc' '$msg_auto_ufs_help'
-	'$msg_manual' '$msg_manual_desc' '$msg_manual_help'
-	'$msg_shell' '$msg_shell_desc' '$msg_shell_help'
-" # END-QUOTE
-
-CURARCH=$( uname -m )
-case $CURARCH in
-	amd64|arm64|i386|riscv)	# Booting ZFS Supported
-		PMODES="
-			'$msg_auto_zfs' '$msg_auto_zfs_desc' '$msg_auto_zfs_help'
-			$PMODES
-		" # END-QUOTE
-		;;
-	*)			# Booting ZFS Unsupported
-		;;
-esac
-
-exec 3>&1
-PARTMODE=`echo $PMODES | xargs dialog --backtitle "FreeBSD Installer" \
-	--title "Partitioning" \
-	--item-help \
-	--menu "How would you like to partition your disk?" \
-	0 0 0 2>&1 1>&3` || exit 1
-exec 3>&-
-
-case "$PARTMODE" in
-"$msg_auto_zfs")	# ZFS
-	bsdinstall zfsboot || error "ZFS setup failed"
-	bsdinstall mount || error "Failed to mount filesystem"
-	;;
-"$msg_auto_ufs")	# Guided UFS
-	bsdinstall autopart || error "Partitioning error"
-	bsdinstall mount || error "Failed to mount filesystem"
-	;;
-"$msg_shell")		# Shell
-	clear
-	echo "Use this shell to set up partitions for the new system. When finished, mount the system at $BSDINSTALL_CHROOT and place an fstab file for the new system at $PATH_FSTAB. Then type 'exit'. You can also enter the partition editor at any time by entering 'bsdinstall partedit'."
-	sh 2>&1
-	;;
-"$msg_manual")		# Manual
-	if f_isset debugFile; then
-		# Give partedit the path to our logfile so it can append
-		BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error "Partitioning error"
-	else
-		bsdinstall partedit || error "Partitioning error"
-	fi
-	bsdinstall mount || error "Failed to mount filesystem"
-	;;
-*)
-	error "Unknown partitioning mode"
-	;;
-esac
-
-if [ -n "$FETCH_DISTRIBUTIONS" ]; then
-	exec 3>&1
-	export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&3)
-	FETCH_RESULT=$?
-	exec 3>&-
-
-	[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions"
-fi
-bsdinstall checksum || error "Distribution checksum failed"
-bsdinstall distextract || error "Distribution extract failed"
-
-# Set up boot loader
-bsdinstall bootconfig || error "Failed to configure bootloader"
-
-bsdinstall rootpass || error "Could not set root password"
-
-trap true SIGINT	# This section is optional
-if [ "$NETCONFIG_DONE" != yes ]; then
-	bsdinstall netconfig	# Don't check for errors -- the user may cancel
-fi
-bsdinstall time
-bsdinstall services
-bsdinstall hardening
-
-dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \
-    "Would you like to add users to the installed system now?" 0 0 && \
-    bsdinstall adduser
-
-finalconfig() {
-	exec 3>&1
-	REVISIT=$(dialog --backtitle "FreeBSD Installer" \
-	    --title "Final Configuration" --no-cancel --menu \
-	    "Setup of your FreeBSD system is nearly complete. You can now modify your configuration choices. After this screen, you will have an opportunity to make more complex changes using a shell." 0 0 0 \
-		"Exit" "Apply configuration and exit installer" \
-		"Add User" "Add a user to the system" \
-		"Root Password" "Change root password" \
-		"Hostname" "Set system hostname" \
-		"Network" "Networking configuration" \
-		"Services" "Set daemons to run on startup" \
-		"System Hardening" "Set security options" \
-		"Time Zone" "Set system timezone" \
-		"Handbook" "Install FreeBSD Handbook (requires network)" 2>&1 1>&3)
-	exec 3>&-
-
-	case "$REVISIT" in
-	"Add User")
-		bsdinstall adduser
-		finalconfig
-		;;
-	"Root Password")
-		bsdinstall rootpass
-		finalconfig
-		;;
-	"Hostname")
-		bsdinstall hostname
-		finalconfig
-		;;
-	"Network")
-		bsdinstall netconfig
-		finalconfig
-		;;
-	"Services")
-		bsdinstall services
-		finalconfig
-		;;
-	"System Hardening")
-		bsdinstall hardening
-		finalconfig
-		;;
-	"Time Zone")
-		bsdinstall time
-		finalconfig
-		;;
-	"Handbook")
-		bsdinstall docsinstall
-		finalconfig
-		;;
-	esac
-}
-
-# Allow user to change his mind
-finalconfig
-
-trap error SIGINT	# SIGINT is bad again
-bsdinstall config  || error "Failed to save config"
-
-if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then
-	rm -rf "$BSDINSTALL_FETCHDEST"
-fi
-
-dialog --backtitle "FreeBSD Installer" --title "Manual Configuration" \
-    --default-button no --yesno \
-   "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0
-if [ $? -eq 0 ]; then
-	clear
-	echo This shell is operating in a chroot in the new system. \
-	    When finished making configuration changes, type \"exit\".
-	chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1
-fi
-
-bsdinstall entropy
-bsdinstall umount
-
-f_dprintf "Installation Completed at %s" "$( date )"
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/bootconfig b/bsdinstall/scripts/bootconfig
deleted file mode 100755
index c5218b10a271..000000000000
--- a/bsdinstall/scripts/bootconfig
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2018 Rebecca Cran
-# Copyright (c) 2017 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-
-FREEBSD_BOOTLABEL="FreeBSD"
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-
-: ${TMPDIR:="/tmp"}
-
-die() {
-	echo $*
-	exit 1
-}
-
-if [ `uname -m` == powerpc ]; then
-	platform=`sysctl -n hw.platform`
-	if [ "$platform" == ps3 -o "$platform" == powernv ]; then
-		rootpart=$(awk '{ if($2 == "/") printf("%s:%s\n", $3, $1); }' $PATH_FSTAB)
-		kboot_conf=$BSDINSTALL_CHROOT/boot/etc/kboot.conf
-		mkdir -p $BSDINSTALL_CHROOT/boot/etc/
-		echo default=$FREEBSD_BOOTLABEL > $kboot_conf
-		echo $FREEBSD_BOOTLABEL=\'/kernel/kernel kernelname=/boot/kernel/kernel vfs.root.mountfrom=${rootpart}\' >> $kboot_conf
-	fi
-fi
-
-# Update the ESP (EFI System Partition) with the new bootloader if we have an ESP
-if [ -n "$(awk '{if ($2=="/boot/efi") printf("%s\n",$1);}' $PATH_FSTAB)" ]; then
-	case $(uname -m) in
-	    arm64)	ARCHBOOTNAME=aa64 ;;
-	    amd64)	ARCHBOOTNAME=x64 ;;
-	    riscv)	ARCHBOOTNAME=riscv64 ;;
-    #	    arm)	ARCHBOOTNAME=arm ;; # No other support for arm install
-    #	    i386)	ARCHBOOTNAME=ia32 ;; # no support for this in i386 kernels, rare machines
-	    *)		die "Unsupported arch $(uname -m) for UEFI install"
-	esac
-	BOOTDIR="/efi/boot"
-	BOOTNAME="${BOOTDIR}/boot${ARCHBOOTNAME}.efi"
-	FREEBSD_BOOTDIR="/efi/freebsd"
-	FREEBSD_BOOTNAME="${FREEBSD_BOOTDIR}/loader.efi"
-	mntpt="$BSDINSTALL_CHROOT/boot/efi"
-
-	f_dprintf "Installing loader.efi onto ESP"
-	mkdir -p "${mntpt}/${FREEBSD_BOOTDIR}" "${mntpt}/${BOOTDIR}"
-	cp "$BSDINSTALL_CHROOT/boot/loader.efi" "${mntpt}/${FREEBSD_BOOTNAME}"
-
-	#
-	# The following shouldn't be necessary. UEFI defines a way to
-	# specifically select what to boot (which we do via
-	# efibootmgr). However, virtual environments often times lack
-	# support for the NV variables efibootmgr sets. In addition,
-	# some UEFI implementations have features that interfere with
-	# the setting of these variables. To combat that, we install the
-	# default removable media boot file as a fallback if it doesn't
-	# exist. We don't install it all the time since that can
-	# interfere with other installations on the drive (like rEFInd).
-	#
-	if [ ! -f "${mntpt}/${BOOTNAME}" ]; then
-		cp "$BSDINSTALL_CHROOT/boot/loader.efi" "${mntpt}/${BOOTNAME}"
-	fi
-
-	if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
-		f_dprintf "Creating UEFI boot entry"
-		efibootmgr --create --activate --label "$FREEBSD_BOOTLABEL" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null
-	fi
-
-	f_dprintf "Finished configuring ESP"
-fi
-
-# Add boot0cfg for MBR BIOS booting?
diff --git a/bsdinstall/scripts/checksum b/bsdinstall/scripts/checksum
deleted file mode 100755
index ff404d7f587b..000000000000
--- a/bsdinstall/scripts/checksum
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-test -f $BSDINSTALL_DISTDIR/MANIFEST || exit 0
-
-percentage=0
-for dist in $DISTRIBUTIONS; do
-	distname=$(basename $dist .txz)
-	eval "status_$distname=7"
-
-	items=""
-	for i in $DISTRIBUTIONS; do
-		items="$items $i `eval echo \\\${status_$(basename $i .txz):-Pending}`"
-	done
-	dialog --backtitle "FreeBSD Installer" --title "Checksum Verification" \
-	    --mixedgauge "Verifying checksums of selected distributions." \
-	    0 0 $percentage $items
-
-	CK=`sha256 -q $BSDINSTALL_DISTDIR/$dist`
-	awk -v checksum=$CK -v dist=$dist -v found=0 '{
-		if (dist == $1) {
-			found = 1
-			if (checksum == $2)
-				exit(0)
-			else
-				exit(2)
-		}
-	} END {if (!found) exit(1);}' $BSDINSTALL_DISTDIR/MANIFEST
-
-	CK_VALID=$?
-	if [ $CK_VALID -le 1 ]; then
-		if [ $CK_VALID -eq 0 ]; then
-			eval "status_$distname=2"
-		else
-			eval "status_$distname=6"
-		fi
-		percentage=$(echo $percentage + 100/`echo $DISTRIBUTIONS | wc -w` | bc)
-	else
-		eval "status_$distname=1"
-		case $(/bin/freebsd-version -u) in
-		*-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE)
-			dialog --backtitle "FreeBSD Installer" --title "Error" \
-			    --msgbox "The checksum for $dist does not match. It may have become corrupted, or it may be from a newer version of FreeBSD. Please check for a newer snapshot." 0 0
-			;;
-		*)
-			dialog --backtitle "FreeBSD Installer" --title "Error" \
-			    --msgbox "The checksum for $dist does not match. It may have become corrupted, and should be redownloaded." 0 0
-			;;
-		esac
-		exit 1
-	fi
-done
-
-exit 0
diff --git a/bsdinstall/scripts/config b/bsdinstall/scripts/config
deleted file mode 100755
index a909c3faee63..000000000000
--- a/bsdinstall/scripts/config
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2013-2015 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ MAIN
-
-cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
-rm $BSDINSTALL_TMPETC/rc.conf.*
-
-cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.* >> $BSDINSTALL_TMPETC/sysctl.conf
-rm $BSDINSTALL_TMPETC/sysctl.conf.*
-
-if [ -f $BSDINSTALL_TMPETC/ttys.hardening ]; then
-	cat $BSDINSTALL_TMPETC/ttys.hardening > $BSDINSTALL_TMPETC/ttys
-	rm $BSDINSTALL_TMPETC/ttys.hardening
-fi
-
-cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
-
-cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf
-rm $BSDINSTALL_TMPBOOT/loader.conf.*
-# The 'cryptodev_load' line is a workaround for arm64, which does not
-# automatically load cryptodev.ko with zfs.ko.
-df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "cryptodev_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf
-df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf
-
-cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot
-
-[ "${debugFile#+}" ] && cp "${debugFile#+}" $BSDINSTALL_CHROOT/var/log/
-
-# Set up other things from installed config
-chroot $BSDINSTALL_CHROOT /usr/bin/newaliases > /dev/null 2>&1
-
-exit 0
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/docsinstall b/bsdinstall/scripts/docsinstall
deleted file mode 100755
index ea6fcf49b029..000000000000
--- a/bsdinstall/scripts/docsinstall
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Marc Fonvieille
-# Copyright (c) 2013-2015 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/mustberoot.subr
-f_include $BSDCFG_SHARE/packages/packages.subr
-
-############################################################ CONFIGURATION
-
-#
-# List of languages to display (descriptions pulled from $msg_{lang}doc_desc)
-#
-: ${DOCSINSTALL_LANGS:=\
-	bn da de el en es fr hu it ja ko mn nl pl pt ru tr zh_cn zh_tw \
-}
-
-############################################################ GLOBALS
-
-#
-# Strings that should be moved to an i18n file and loaded with f_include_lang()
-#
-hline_arrows_space_tab_enter="Use arrows, SPACE, TAB or ENTER"
-msg_bndoc_desc="Bengali Documentation"
-msg_cancel="Cancel"
-msg_dadoc_desc="Danish Documentation"
-msg_dedoc_desc="German Documentation"
-msg_docsinstall_menu_text="This menu allows you to install the whole documentation set from\nthe FreeBSD Documentation Project: Handbook, FAQ, and articles.\n\nPlease select the language versions you wish to install. At\nminimum, you should install the English version, the original\nversion of the documentation."
-msg_eldoc_desc="Greek Documentation"
-msg_endoc_desc="English Documentation (recommended)"
-msg_esdoc_desc="Spanish Documentation"
-msg_frdoc_desc="French Documentation"
-msg_freebsd_documentation_installation="FreeBSD Documentation Installation"
-msg_freebsd_installer="FreeBSD Installer"
-msg_hudoc_desc="Hungarian Documentation"
-msg_itdoc_desc="Italian Documentation"
-msg_jadoc_desc="Japanese Documentation"
-msg_kodoc_desc="Korean Documentation"
-msg_mndoc_desc="Mongolian Documentation"
-msg_nldoc_desc="Dutch Documentation"
-msg_ok="OK"
-msg_pldoc_desc="Polish Documentation"
-msg_ptdoc_desc="Portuguese Documentation"
-msg_rudoc_desc="Russian Documentation"
-msg_trdoc_desc="Turkish Documentation"
-msg_zh_cndoc_desc="Simplified Chinese Documentation"
-msg_zh_twdoc_desc="Traditional Chinese Documentation"
-
-############################################################ FUNCTIONS
-
-# dialog_menu_main
-#
-# Display the dialog(1)-based application main menu.
-#
-dialog_menu_main()
-{
-	local title="$DIALOG_TITLE"
-	local btitle="$DIALOG_BACKTITLE"
-	local prompt="$msg_docsinstall_menu_text"
-	local check_list= # Calculated below
-	local hline="$hline_arrows_space_tab_enter"
-
-	local lang desc upper status
-	for lang in $DOCSINSTALL_LANGS; do
-		# Fetch the i18n description to display
-		f_getvar msg_${lang}doc_desc desc
-		f_shell_escape "$desc" desc
-
-		# Get default status for each language
-		upper=$( echo "$lang" | awk '{print toupper($0)}' )
-		case "$lang" in
-		en) f_getvar DIST_DOC_$upper:-on status ;;
-		 *) f_getvar DIST_DOC_$upper:-off status
-		esac
-
-		check_list="$check_list
-			'$lang' '$desc' '$status'
-		" # END-QUOTE
-	done
-
-	local height width rows
-	eval f_dialog_checklist_size height width rows \
-	                             \"\$title\"  \
-	                             \"\$btitle\" \
-	                             \"\$prompt\" \
-	                             \"\$hline\"  \
-	                             $check_list
-	local selected
-	#selected=$( eval $DIALOG \
-	selected=$( eval ../../bsddialog \
-		--title \"\$title\"             \
-		--backtitle \"\$btitle\"        \
-		--separate-output               \
-		--hline \"\$hline\"             \
-		--ok-label \"\$msg_ok\"         \
-		--cancel-label \"\$msg_cancel\" \
-		--checklist \"\$prompt\"        \
-		$height $width $rows            \
-		$check_list                     \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	)
-	local retval=$?
-	f_dialog_menutag_store -s "$selected"
-	return $retval
-}
-
-############################################################ MAIN
-
-#
-# Initialize
-#
-f_dialog_title "$msg_freebsd_documentation_installation"
-f_dialog_backtitle "$msg_freebsd_installer"
-f_mustberoot_init
-
-#
-# Launch application main menu
-#
-dialog_menu_main || f_die
-f_dialog_menutag_fetch selected
-
-# Let pkg_add be able to use name servers
-f_quietly cp -f $BSDINSTALL_TMPETC/resolv.conf $BSDINSTALL_CHROOT/etc/
-
-#
-# Install each of the selected packages
-#
-docsets=""
-for lang in $selected; do
-	docsets="$docsets $lang-freebsd-doc"
-done
-
-ASSUME_ALWAYS_YES=YES chroot $BSDINSTALL_CHROOT pkg install $docsets
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/entropy b/bsdinstall/scripts/entropy
deleted file mode 100755
index d3938f12cb33..000000000000
--- a/bsdinstall/scripts/entropy
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2013 Dag-Erling Smørgrav
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-umask 077
-for i in /entropy /boot/entropy; do
-	i="$BSDINSTALL_CHROOT/$i"
-	dd if=/dev/random of="$i" bs=4096 count=1
-	chown 0:0 "$i"
-done
diff --git a/bsdinstall/scripts/fetchmissingdists b/bsdinstall/scripts/fetchmissingdists
deleted file mode 100644
index 768217e2fb8c..000000000000
--- a/bsdinstall/scripts/fetchmissingdists
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2013-2018 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-
-error()
-{
-	dialog --backtitle "FreeBSD Installer" --title "Error" --msgbox $1 0 0
-	exit 1
-}
-
-FETCH_DISTRIBUTIONS=""
-LOCAL_DISTRIBUTIONS=""
-for dist in $DISTRIBUTIONS; do
-	if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then
-		FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist"
-	else
-		LOCAL_DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS $dist"
-	fi
-done
-LOCAL_DISTRIBUTIONS=`echo $LOCAL_DISTRIBUTIONS`	# Trim white space
-FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS`	# Trim white space
-
-if [ -z "$FETCH_DISTRIBUTIONS" ]; then
-	echo $BSDINSTALL_DISTDIR >&2
-	exit 0
-fi
-
-ALL_DISTRIBUTIONS="$DISTRIBUTIONS"
-WANT_DEBUG=
-
-# Download to a directory in the new system as scratch space
-BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"
-mkdir -p "$BSDINSTALL_FETCHDEST" || error "Could not create directory $BSDINSTALL_FETCHDEST"
-
-if [ -z "$BSDINSTALL_DISTSITE" ]; then
-	exec 3>&1
-	BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
-	MIRROR_BUTTON=$?
-	exec 3>&-
-	test $MIRROR_BUTTON -eq 0 || error "No mirror selected"
-	export BSDINSTALL_DISTSITE
-fi
-
-BSDINSTALL_DISTDIR_ORIG="$BSDINSTALL_DISTDIR"
-export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST"
-export FTP_PASSIVE_MODE=YES
-
-if [ -f "$BSDINSTALL_DISTDIR_ORIG/MANIFEST" ]; then
-	cp "$BSDINSTALL_DISTDIR_ORIG/MANIFEST" "$BSDINSTALL_DISTDIR/MANIFEST"
-	VERIFY_MANIFEST_SIG=0
-else
-	FETCH_DISTRIBUTIONS="MANIFEST $FETCH_DISTRIBUTIONS"
-	VERIFY_MANIFEST_SIG=1
-
-	# XXX actually verify signature on manifest
-	dialog --backtitle "FreeBSD Installer" --title "Warning" --msgbox "Manifest not found on local disk and will be fetched from an unverified source. This is a potential security risk. If you do not wish to proceed, press control-C now." 0 0
-fi
-
-if [ ! -z "$LOCAL_DISTRIBUTIONS" ]; then
-	# Copy local stuff first
-	env DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS" \
-		BSDINSTALL_DISTSITE="file://$BSDINSTALL_DISTDIR" \
-		bsdinstall distfetch || \
-		error "Failed to fetch distribution from local media"
-fi
-
-export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS"
-
-# Iterate through the distribution list and set a flag if debugging
-# distributions have been selected.
-for _DISTRIBUTION in $DISTRIBUTIONS; do
-	case $_DISTRIBUTION in
-		*-dbg.*)
-			[ -e $BSDINSTALL_DISTDIR/$_DISTRIBUTION ] \
-				&& continue
-			WANT_DEBUG=1
-			DEBUG_LIST="\n$DEBUG_LIST\n$_DISTRIBUTION"
-			;;
-		*)
-			;;
-	esac
-done
-
-# Fetch the distributions.
-bsdinstall distfetch
-rc=$?
-
-if [ $rc -ne 0 ]; then
-	# If unable to fetch the remote distributions, recommend
-	# deselecting the debugging distributions, and retrying the
-	# installation, since failure to fetch *-dbg.txz should not
-	# be considered a fatal installation error.
-	msg="Failed to fetch remote distribution"
-	if [ ! -z "$WANT_DEBUG" ]; then
-		# Trim leading and trailing newlines.
-		DEBUG_LIST="${DEBUG_LIST%%\n}"
-		DEBUG_LIST="${DEBUG_LIST##\n}"
-		msg="$msg\n\nPlease deselect the following distributions"
-		msg="$msg and retry the installation:"
-		msg="$msg\n$DEBUG_LIST"
-	fi
-	error "$msg"
-fi
-
-echo $BSDINSTALL_DISTDIR >&2
-
diff --git a/bsdinstall/scripts/hardening b/bsdinstall/scripts/hardening
deleted file mode 100755
index 952b56180ee2..000000000000
--- a/bsdinstall/scripts/hardening
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2016 Bartek Rutkowski
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-: ${DIALOG_OK=0}
-
-echo -n > $BSDINSTALL_TMPETC/rc.conf.hardening
-echo -n > $BSDINSTALL_TMPETC/sysctl.conf.hardening
-echo -n > $BSDINSTALL_TMPBOOT/loader.conf.hardening
-
-exec 3>&1
-FEATURES=$( ../../bsddialog --backtitle "FreeBSD Installer" \
-    --title "System Hardening" --nocancel --separate-output \
-    --checklist "Choose system security hardening options:" \
-    0 0 0 \
-	"0 hide_uids" "Hide processes running as other users" ${hide_uids:-off} \
-	"1 hide_gids" "Hide processes running as other groups" ${hide_gids:-off} \
-	"2 hide_jail" "Hide processes running in jails" ${hide_jail:-off} \
-	"3 read_msgbuf" "Disable reading kernel message buffer for unprivileged users" ${read_msgbuf:-off} \
-	"4 proc_debug" "Disable process debugging facilities for unprivileged users" ${proc_debug:-off} \
-	"5 random_pid" "Randomize the PID of newly created processes" ${random_pid:-off} \
-	"6 clear_tmp" "Clean the /tmp filesystem on system startup" ${clear_tmp:-off} \
-	"7 disable_syslogd" "Disable opening Syslogd network socket (disables remote logging)" ${disable_syslogd:-off} \
-	"8 disable_sendmail" "Disable Sendmail service" ${disable_sendmail:-off} \
-	"9 secure_console" "Enable console password prompt" ${secure_console:-off} \
-	"10 disable_ddtrace" "Disallow DTrace destructive-mode" ${disable_ddtrace:-off} \
-2>&1 1>&3 )
-exec 3>&-
-
-for feature in $FEATURES; do
-	case "$feature" in
-	hide_uids)
-		echo security.bsd.see_other_uids=0 >> $BSDINSTALL_TMPETC/sysctl.conf.hardening
-		;;
-	hide_gids)
-		echo security.bsd.see_other_gids=0 >> $BSDINSTALL_TMPETC/sysctl.conf.hardening
-		;;
-	hide_jail)
-		echo security.bsd.see_jail_proc=0 >> $BSDINSTALL_TMPETC/sysctl.conf.hardening
-		;;
-	read_msgbuf)
-		echo security.bsd.unprivileged_read_msgbuf=0 >> $BSDINSTALL_TMPETC/sysctl.conf.hardening
-		;;
-	proc_debug)
-		echo security.bsd.unprivileged_proc_debug=0 >> $BSDINSTALL_TMPETC/sysctl.conf.hardening
-		;;
-	random_pid)
-		echo kern.randompid=1 >> $BSDINSTALL_TMPETC/sysctl.conf.hardening
-		;;
-	clear_tmp)
-		echo 'clear_tmp_enable="YES"' >> $BSDINSTALL_TMPETC/rc.conf.hardening
-		;;
-	disable_syslogd)
-		echo 'syslogd_flags="-ss"' >> $BSDINSTALL_TMPETC/rc.conf.hardening
-		;;
-	disable_sendmail)
-		echo 'sendmail_enable="NONE"' >> $BSDINSTALL_TMPETC/rc.conf.hardening
-		;;
-	secure_console)
-		sed "s/unknown	off secure/unknown	off insecure/g" $BSDINSTALL_CHROOT/etc/ttys > $BSDINSTALL_TMPETC/ttys.hardening
-		;;
-	disable_ddtrace)
-		echo 'security.bsd.allow_destructive_dtrace=0' >> $BSDINSTALL_TMPBOOT/loader.conf.hardening
-		;;
-	esac
-done
-
diff --git a/bsdinstall/scripts/hostname b/bsdinstall/scripts/hostname
deleted file mode 100755
index 23620ab91571..000000000000
--- a/bsdinstall/scripts/hostname
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2015-2018 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading_includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-
-############################################################ CONFIGURATION
-
-#
-# Default value
-#
-: ${HOSTNAME=$( hostname )}
-
-#
-# Default file to store hostname entry in
-#
-: ${HOSTNAMEFILE:=$BSDINSTALL_TMPETC/rc.conf.hostname}
-
-############################################################ GLOBALS
-
-#
-# Strings that should be moved to an i18n file and loaded with f_include_lang()
-#
-msg_freebsd_installer="FreeBSD Installer"
-msg_ok="OK"
-msg_please_choose_a_hostname="Please choose a hostname for this machine.\n\nIf you are running on a managed network, please ask\nyour network administrator for an appropriate name."
-msg_set_hostname="Set Hostname"
-
-#
-# Command strings for various tasks
-#
-ECHO_OVERWRITE='echo "%s" > "%s"'
-SET_HOSTNAME='hostname -s "%s"'
-
-############################################################ FUNCTIONS
-
-# dialog_hostname
-#
-# Display input box (without cancel button) for user to enter desired hostname.
-#
-dialog_hostname()
-{
-	local prompt="$msg_please_choose_a_hostname"
-	local hline=
-	local value="$*"
-
-	local height width
-	f_dialog_inputbox_size height width \
-		"$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$prompt" "$value" "$hline"
-
-	#$DIALOG \
-	../../bsddialog \
-		--title "$DIALOG_TITLE"         \
-		--backtitle "$DIALOG_BACKTITLE" \
-		--hline "$hline"                \
-		--ok-label "$msg_ok"            \
-		--no-cancel                     \
-		--inputbox "$prompt"            \
-		$height $width "$value"         \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-}
-
-############################################################ MAIN
-
-#
-# Initialize
-#
-f_dialog_title "$msg_set_hostname"
-f_dialog_backtitle "$msg_freebsd_installer"
-
-#
-# Get user input
-#
-HOSTNAME=$( dialog_hostname "$HOSTNAME" )
-[ $? -eq $DIALOG_CANCEL ] && exit 1
-
-#
-# Store the user's choice
-#
-f_eval_catch "$pgm" echo "$ECHO_OVERWRITE" \
-	'hostname=\"$HOSTNAME\"' "$HOSTNAMEFILE"
-retval=$?
-
-#
-# Activate entry if configured
-#
-if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
-	f_eval_catch "$pgm" hostname "$SET_HOSTNAME" "$HOSTNAME"
-	retval=$?
-fi
-
-exit $retval
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/jail b/bsdinstall/scripts/jail
deleted file mode 100755
index d3a84f872fb6..000000000000
--- a/bsdinstall/scripts/jail
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2013-2015 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-
-############################################################ MAIN
-
-f_dprintf "Began Installation at %s" "$( date )"
-export BSDINSTALL_CHROOT=$1
-
-error() {
-	local msg
-	if [ -n "$1" ]; then
-		msg="$1\n\n"
-	fi
-	dialog --backtitle "FreeBSD Installer" --title "Abort" \
-	    --no-label "Exit" --yes-label "Restart" --yesno \
-	    "${msg}An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0
-	if [ $? -ne 0 ]; then
-		exit
-	else
-		exec $0 $BSDINSTALL_CHROOT
-	fi
-}
-
-rm -rf $BSDINSTALL_TMPETC
-mkdir $BSDINSTALL_TMPETC
-mkdir -p $1 || error "mkdir failed for $1"
-
-if [ -n "$SCRIPT" ]
-then
-        split -a 2 -p '^#!.*' "$SCRIPT" $TMPDIR/bsdinstall-installscript-
-        . $TMPDIR/bsdinstall-installscript-aa
-fi
-
-test ! -d $BSDINSTALL_DISTDIR && mkdir -p $BSDINSTALL_DISTDIR
-
-if [ ! -f $BSDINSTALL_DISTDIR/MANIFEST -a -z "$BSDINSTALL_DISTSITE" ]; then
-	exec 3>&1
-	BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
-	MIRROR_BUTTON=$?
-	exec 3>&-
-	test $MIRROR_BUTTON -eq 0 || error "No mirror selected"
-	export BSDINSTALL_DISTSITE
-	fetch -o $BSDINSTALL_DISTDIR/MANIFEST $BSDINSTALL_DISTSITE/MANIFEST || error "Could not download $BSDINSTALL_DISTSITE/MANIFEST"
-fi
-
-: ${DISTRIBUTIONS="base.txz"}; export DISTRIBUTIONS
-if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
-	DISTMENU=`cut -f 4,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base`
-
-    if [ ! "$nonInteractive" == "YES" ]
-    then
-	    exec 3>&1
-	    EXTRA_DISTS=$(echo $DISTMENU | xargs dialog \
-	        --backtitle "FreeBSD Installer" \
-	        --title "Distribution Select" --nocancel --separate-output \
-	        --checklist "Choose optional system components to install:" \
-	        0 0 0 \
-	    2>&1 1>&3)
-	    for dist in $EXTRA_DISTS; do
-	    	export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
-	    done
-    fi
-fi
-
-FETCH_DISTRIBUTIONS=""
-for dist in $DISTRIBUTIONS; do
-	if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then
-		FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist"
-	fi
-done
-FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS`	# Trim white space
-
-if [ -n "$FETCH_DISTRIBUTIONS" -a -z "$BSDINSTALL_DISTSITE" ]; then
-	exec 3>&1
-	BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
-	MIRROR_BUTTON=$?
-	exec 3>&-
-	test $MIRROR_BUTTON -eq 0 || error "No mirror selected"
-	export BSDINSTALL_DISTSITE
-fi
-
-if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
-	bsdinstall distfetch || error "Failed to fetch distribution"
-fi
-
-bsdinstall checksum || error "Distribution checksum failed"
-bsdinstall distextract || error "Distribution extract failed"
-
-if [ ! "$nonInteractive" == "YES" ]
-then
-    bsdinstall rootpass || error "Could not set root password"
-fi
-
-trap true SIGINT	# This section is optional
-
-if [ ! "$nonInteractive" == "YES" ]
-then
-bsdinstall services
-
-    dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \
-        "Would you like to add users to the installed system now?" 0 0 && \
-        bsdinstall adduser
-fi
-
-trap error SIGINT	# SIGINT is bad again
-bsdinstall config  || error "Failed to save config"
-cp /etc/resolv.conf $1/etc
-cp /etc/localtime $1/etc
-cp /var/db/zoneinfo $1/var/db
-
-# Run post-install script
-if [ -f $TMPDIR/bsdinstall-installscript-ab ]; then
-	cp $TMPDIR/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/tmp/installscript
-	chmod a+x $BSDINSTALL_CHROOT/tmp/installscript
-	mount -t devfs devfs "$BSDINSTALL_CHROOT/dev"
-	chroot $BSDINSTALL_CHROOT /tmp/installscript $@ 2>&1
-	umount "$BSDINSTALL_CHROOT/dev"
-	rm $BSDINSTALL_CHROOT/tmp/installscript
-fi
-
-bsdinstall entropy
-
-f_dprintf "Installation Completed at %s" "$(date)"
-exit $SUCCESS
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/keymap b/bsdinstall/scripts/keymap
deleted file mode 100755
index 739d0223c4f4..000000000000
--- a/bsdinstall/scripts/keymap
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2013-2015 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/keymap.subr
-f_include $BSDCFG_SHARE/sysrc.subr
-
-############################################################ CONFIGURATION
-
-#
-# Default file to store keymap selection in
-#
-: ${KEYMAPFILE:=$BSDINSTALL_TMPETC/rc.conf.keymap}
-
-############################################################ GLOBALS
-
-#
-# Strings that should be moved to an i18n file and loaded with f_include_lang()
-#
-hline_arrows_tab_enter="Press arrows, TAB or ENTER"
-msg_continue_with_keymap="Continue with %s keymap"
-msg_default="default"
-msg_error="Error"
-msg_freebsd_installer="FreeBSD Installer"
-msg_keymap_menu_text="The system console driver for FreeBSD defaults to standard \"US\"\nkeyboard map. Other keymaps can be chosen below."
-msg_keymap_selection="Keymap Selection"
-msg_ok="OK"
-msg_select="Select"
-msg_test_keymap="Test %s keymap"
-msg_test_the_currently_selected_keymap="Test the currently selected keymap"
-msg_test_the_keymap_by_typing="Test the keymap by typing letters, numbers, and symbols. Characters\nshould match labels on the keyboard keys. Press Enter to stop testing."
-
-############################################################ FUNCTIONS
-
-# dialog_keymap_test $keymap
-#
-# Activate $keymap and display an input box (without cancel button) for the
-# user to test keyboard input and return. Always returns success.
-#
-dialog_keymap_test()
-{
-	local keym="$1"
-	local title= # Calculated below
-	local btitle= # Calculated below
-	local prompt="$msg_test_the_keymap_by_typing"
-	local hline=
-
-	# Attempt to activate the keymap
-	if [ "$keym" ]; then
-		local err
-		err=$( f_keymap_kbdcontrol "$keym" 2>&1 > /dev/null )
-		if [ "$err" ]; then
-			f_dialog_title "$msg_error"
-			f_dialog_msgbox "$err"
-			f_dialog_title_restore
-			return $FAILURE
-		fi
-	fi
-
-	f_dialog_title "$( printf "$msg_test_keymap" "${keym:-$msg_default}" )"
-	title="$DIALOG_TITLE"
-	btitle="$DIALOG_BACKTITLE"
-	f_dialog_title_restore
-
-	local height width
-	f_dialog_inputbox_size height width \
-		"$title" "$btitle" "$prompt" "" "$hline"
-
-	$DIALOG \
-		--title "$title"      \
-		--backtitle "$btitle" \
-		--hline "$hline"      \
-		--ok-label "$msg_ok"  \
-		--no-cancel           \
-		--inputbox "$prompt"  \
-		$height $width        \
-		2>/dev/null >&$DIALOG_TERMINAL_PASSTHRU_FD
-
-	return $DIALOG_OK
-}
-
-############################################################ MAIN
-
-#
-# Initialize
-#
-f_dialog_title "$msg_keymap_selection"
-f_dialog_backtitle "$msg_freebsd_installer"
-
-#
-# Die immediately if we can't dump the current keyboard map
-#
-#error=$( kbdcontrol -d 2>&1 > /dev/null ) || f_die $FAILURE "%s" "$error"
-
-# Capture Ctrl-C for clean-up
-trap 'rm -f $KEYMAPFILE; exit $FAILURE' SIGINT
-
-# Get a value from rc.conf(5) as initial value (if not being scripted)
-f_getvar $VAR_KEYMAP keymap
-if [ ! "$keymap" ]; then
-	keymap=$( f_sysrc_get keymap )
-	case "$keymap" in [Nn][Oo]) keymap="";; esac
-fi
-
-#
-# Loop until the user has finalized their selection (by clicking the
-# [relabeled] Cancel button).
-#
-width=67 first_pass=1 back_from_testing=
-[ "$USE_XDIALOG" ] && width=70
-prompt="$msg_keymap_menu_text"
-hline="$hline_arrows_tab_enter"
-while :; do
-	#
-	# Re/Build list of keymaps
-	#
-	cont_msg=$( printf "$msg_continue_with_keymap" \
-	                   "${keymap:-$msg_default}" )
-	test_msg=$( printf "$msg_test_keymap" "${keymap:-$msg_default}" )
-	menu_list="
-		'>>> $cont_msg' '' '$msg_continue_with_current_keymap'
-		'->- $test_msg' '' '$msg_test_the_currently_selected_keymap'
-	" # END-QUOTE
-	if [ "$first_pass" ]; then
-		defaultitem=
-		first_pass=
-	else
-		defaultitem="->- $test_msg"
-	fi
-	for k in $KEYMAPS; do
-		keymap_$k get keym keym
-		keymap_$k get desc desc
-		radio=" "
-		if [ "$keym" = "$keymap" ]; then
-			radio="*"
-			if [ "$back_from_testing" ]; then
-				defaultitem="(*) $desc"
-				back_from_testing=
-			fi
-		fi
-		f_shell_escape "$desc" desc
-		menu_list="$menu_list
-			'($radio) $desc' '' '$keym: $desc'
-		" # END-QUOTE
-	done
-	back_from_testing=
-
-	#
-	# Display keymap configuration menu
-	#
-	eval f_dialog_menu_with_help_size height \"\" rows \
-		\"\$DIALOG_TITLE\"     \
-		\"\$DIALOG_BACKTITLE\" \
-		\"\$prompt\"           \
-		\"\$hline\"            \
-		$menu_list
-	menu_choice=$( eval $DIALOG \
-		--title \"\$DIALOG_TITLE\"         \
-		--backtitle \"\$DIALOG_BACKTITLE\" \
-		--hline \"\$hline\"                \
-		--keep-tite                        \
-		--item-help                        \
-		--ok-label \"\$msg_select\"        \
-		--cancel-label \"\$msg_cancel\"    \
-		--default-item \"\$defaultitem\"   \
-		--menu \"\$prompt\"                \
-		$height $width $rows               \
-		$menu_list                         \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	) || {
-		f_quietly rm -f "$KEYMAPFILE"
-		exit $FAILURE # Exit with an error so bsdinstall restarts
-	}
-	f_dialog_data_sanitize menu_choice
-
-	case "$menu_choice" in
-	">>> "*) # Continue with keymap
-		break ;;
-	"->-"*) # Test keymap
-		dialog_keymap_test "$keymap"
-		back_from_testing=1
-		continue ;;
-	esac
-
-	# Turn the user's choice into a number
-	n=$( eval f_dialog_menutag2index_with_help \
-		\"\$menu_choice\" $menu_list )
-
-	# Turn that number ithe name of the keymap struct
-	k=$( set -- $KEYMAPS; eval echo \"\${$(( $n - 2))}\" )
-
-	# Get actual keymap setting while we update $keymap and $KEYMAPFILE
-	keymap_$k get keym keymap
-	echo "keymap=\"$keymap\"" > "$KEYMAPFILE"
-done
-
-f_quietly f_keymap_kbdcontrol "$keymap"
-exit $SUCCESS
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/mirrorselect b/bsdinstall/scripts/mirrorselect
deleted file mode 100755
index 67ef5f2c02a6..000000000000
--- a/bsdinstall/scripts/mirrorselect
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_HELP=2}
-: ${DIALOG_EXTRA=3}
-: ${DIALOG_ITEM_HELP=4}
-: ${DIALOG_ESC=255}
-
-exec 3>&1
-MIRROR=`../../bsddialog --backtitle "FreeBSD Installer" \
-    --title "Mirror Selection" --extra-button --extra-label "Other" \
-    --menu "Please select the site closest to you or \"other\" if you'd like to specify a different choice.  Also note that not every site listed here carries more than the base distribution kits. Only Primary sites are guaranteed to carry the full range of possible distributions. Select a site that's close!" \
-    0 0 0 \
-	ftp://ftp.freebsd.org	"Main Site"\
-	ftp://ftp.freebsd.org 	"IPv6 Main Site"\
-	ftp://ftp3.ie.freebsd.org 	"IPv6 Ireland"\
-	ftp://ftp2.jp.freebsd.org 	"IPv6 Japan"\
-	ftp://ftp4.se.freebsd.org	"IPv6 Sweden"\
-	ftp://ftp4.us.freebsd.org 	"IPv6 USA"\
-	ftp://ftp1.freebsd.org 	"Primary"\
-	ftp://ftp2.freebsd.org 	"Primary #2"\
-	ftp://ftp3.freebsd.org 	"Primary #3"\
-	ftp://ftp4.freebsd.org 	"Primary #4"\
-	ftp://ftp5.freebsd.org 	"Primary #5"\
-	ftp://ftp6.freebsd.org 	"Primary #6"\
-	ftp://ftp7.freebsd.org 	"Primary #7"\
-	ftp://ftp10.freebsd.org 	"Primary #10"\
-	ftp://ftp11.freebsd.org 	"Primary #11"\
-	ftp://ftp12.freebsd.org 	"Primary #12"\
-	ftp://ftp13.freebsd.org 	"Primary #13"\
-	ftp://ftp14.freebsd.org 	"Primary #14"\
-	ftp://ftp.au.freebsd.org 	"Australia"\
-	ftp://ftp2.au.freebsd.org 	"Australia #2"\
-	ftp://ftp3.au.freebsd.org 	"Australia #3"\
-	ftp://ftp.at.freebsd.org 	"Austria"\
-	ftp://ftp2.br.freebsd.org 	"Brazil #2"\
-	ftp://ftp3.br.freebsd.org 	"Brazil #3"\
-	ftp://ftp4.br.freebsd.org 	"Brazil #4"\
-	ftp://ftp.bg.freebsd.org 	"Bulgaria"\
-	ftp://ftp.cn.freebsd.org 	"China"\
-	ftp://ftp.cz.freebsd.org 	"Czech Republic"\
-	ftp://ftp.dk.freebsd.org 	"Denmark"\
-	ftp://ftp.fi.freebsd.org 	"Finland"\
-	ftp://ftp.fr.freebsd.org 	"France"\
-	ftp://ftp3.fr.freebsd.org 	"France #3"\
-	ftp://ftp4.fr.freebsd.org 	"IPv6 France #4"\
-	ftp://ftp5.fr.freebsd.org 	"France #5"\
-	ftp://ftp6.fr.freebsd.org 	"France #6"\
-	ftp://ftp7.fr.freebsd.org 	"France #7"\
-	ftp://ftp8.fr.freebsd.org 	"IPv6 France #8"\
-	ftp://ftp.de.freebsd.org 	"Germany"\
-	ftp://ftp2.de.freebsd.org 	"Germany #2"\
-	ftp://ftp4.de.freebsd.org 	"Germany #4"\
-	ftp://ftp5.de.freebsd.org 	"Germany #5"\
-	ftp://ftp7.de.freebsd.org 	"Germany #7"\
-	ftp://ftp8.de.freebsd.org 	"Germany #8"\
-	ftp://ftp.gr.freebsd.org 	"Greece"\
-	ftp://ftp2.gr.freebsd.org 	"Greece #2"\
-	ftp://ftp3.ie.freebsd.org 	"Ireland #3"\
-	ftp://ftp.jp.freebsd.org 	"Japan"\
-	ftp://ftp2.jp.freebsd.org 	"Japan #2"\
-	ftp://ftp3.jp.freebsd.org 	"Japan #3"\
-	ftp://ftp4.jp.freebsd.org 	"Japan #4"\
-	ftp://ftp5.jp.freebsd.org 	"Japan #5"\
-	ftp://ftp6.jp.freebsd.org 	"Japan #6"\
-	ftp://ftp7.jp.freebsd.org 	"Japan #7"\
-	ftp://ftp8.jp.freebsd.org 	"Japan #8"\
-	ftp://ftp9.jp.freebsd.org 	"Japan #9"\
-	ftp://ftp.kr.freebsd.org 	"Korea"\
-	ftp://ftp2.kr.freebsd.org 	"Korea #2"\
-	ftp://ftp.lv.freebsd.org 	"Latvia"\
-	ftp://ftp.nl.freebsd.org 	"Netherlands"\
-	ftp://ftp2.nl.freebsd.org 	"Netherlands #2"\
-	ftp://ftp.nz.freebsd.org 	"New Zealand"\
-	ftp://ftp.no.freebsd.org 	"Norway"\
-	ftp://ftp.pl.freebsd.org 	"Poland"\
-	ftp://ftp.ru.freebsd.org 	"Russia"\
-	ftp://ftp2.ru.freebsd.org 	"Russia #2"\
-	ftp://ftp5.ru.freebsd.org 	"Russia #5"\
-	ftp://ftp6.ru.freebsd.org 	"Russia #6"\
-	ftp://ftp.sk.freebsd.org 	"Slovak Republic"\
-	ftp://ftp2.sk.freebsd.org 	"Slovak Republic #2"\
-	ftp://ftp.si.freebsd.org 	"Slovenia"\
-	ftp://ftp.za.freebsd.org 	"South Africa"\
-	ftp://ftp2.za.freebsd.org 	"South Africa #2"\
-	ftp://ftp4.za.freebsd.org 	"South Africa #4"\
-	ftp://ftp.se.freebsd.org 	"Sweden"\
-	ftp://ftp4.se.freebsd.org 	"Sweden #4"\
-	ftp://ftp.ch.freebsd.org 	"Switzerland"\
-	ftp://ftp.tw.freebsd.org 	"Taiwan"\
-	ftp://ftp2.tw.freebsd.org 	"Taiwan #2"\
-	ftp://ftp3.tw.freebsd.org 	"Taiwan #3"\
-	ftp://ftp4.tw.freebsd.org 	"Taiwan #4"\
-	ftp://ftp6.tw.freebsd.org 	"Taiwan #6"\
-	ftp://ftp11.tw.freebsd.org 	"Taiwan #11"\
-	ftp://ftp.uk.freebsd.org 	"UK"\
-	ftp://ftp2.uk.freebsd.org 	"UK #2"\
-	ftp://ftp3.uk.freebsd.org 	"UK #3"\
-	ftp://ftp4.uk.freebsd.org 	"UK #4"\
-	ftp://ftp5.uk.freebsd.org 	"UK #5"\
-	ftp://ftp.ua.freebsd.org 	"Ukraine"\
-	ftp://ftp1.us.freebsd.org 	"USA #1"\
-	ftp://ftp2.us.freebsd.org 	"USA #2"\
-	ftp://ftp3.us.freebsd.org 	"USA #3"\
-	ftp://ftp4.us.freebsd.org 	"USA #4"\
-	ftp://ftp5.us.freebsd.org 	"USA #5"\
-	ftp://ftp6.us.freebsd.org 	"USA #6"\
-	ftp://ftp8.us.freebsd.org 	"USA #8"\
-	ftp://ftp10.us.freebsd.org 	"USA #10"\
-	ftp://ftp11.us.freebsd.org 	"USA #11"\
-	ftp://ftp13.us.freebsd.org 	"USA #13"\
-	ftp://ftp14.us.freebsd.org 	"USA #14"\
-	ftp://ftp15.us.freebsd.org 	"USA #15"\
-    2>&1 1>&3`
-MIRROR_BUTTON=$?
-exec 3>&-
-
-_UNAME_R=`uname -r`
-_UNAME_R=${_UNAME_R%-p*}
-
-case ${_UNAME_R} in
-	*-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE)
-		RELDIR="snapshots"
-		;;
-	*)
-		RELDIR="releases"
-		;;
-esac
-
-BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}"
-
-case $MIRROR_BUTTON in
-$DIALOG_CANCEL)
-	exit 1
-	;;
-$DIALOG_OK)
-	;;
-$DIALOG_EXTRA)
-	exec 3>&1
-	BSDINSTALL_DISTSITE=`../../bsddialog --backtitle "FreeBSD Installer" \
-	    --title "Mirror Selection" \
-	    --inputbox "Please enter the URL to an alternate FreeBSD mirror:" \
-	    0 30 "$BSDINSTALL_DISTSITE" 2>&1 1>&3`
-	    #0 0 "$BSDINSTALL_DISTSITE" 2>&1 1>&3` known bug: inputbox cols autosize
-	MIRROR_BUTTON=$?
-	exec 3>&-
-	test $MIRROR_BUTTON -eq 0 || exec $0 $@
-	;;
-esac
-
-export BSDINSTALL_DISTSITE
-echo $BSDINSTALL_DISTSITE >&2
diff --git a/bsdinstall/scripts/mount b/bsdinstall/scripts/mount
deleted file mode 100755
index c7bc1aa5387d..000000000000
--- a/bsdinstall/scripts/mount
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-TMP_FSTAB=${TMPDIR:-"/tmp"}/bsdinstall-tmp-fstab
-
-cat $PATH_FSTAB | awk -v BSDINSTALL_CHROOT=$BSDINSTALL_CHROOT '{
-	if ($2 ~ "^/.*") {
-		fsname = $2;
-		if (fsname == "/")
-			fsname = ""
-		printf("%s\t%s%s\t%s\t%s\t%s\t%s\n", $1, BSDINSTALL_CHROOT,
-		    fsname, $3, $4, $5, $6);
-	}
-}' > $TMP_FSTAB
-
-FILESYSTEMS=`cat $TMP_FSTAB | awk '/^[^#].*/ {if ($2 ~ "^/.*") printf("%s\n", $2);}' | sort -t /`
-
-for i in $FILESYSTEMS; do
-	mkdir -p $i 2>/dev/null
-	MNTERROR=`mount -F $TMP_FSTAB $i 2>&1`
-	if [ $? -ne 0 ]; then
-		dialog --backtitle "FreeBSD Installer" --title "Error" \
-		    --msgbox "Error mounting partition $i:\n$MNTERROR" 0 0
-		exit 1
-	fi
-done
-
-# User might want a shell and require devfs, so mount it
-mkdir $BSDINSTALL_CHROOT/dev 2>/dev/null
-mount -t devfs devfs $BSDINSTALL_CHROOT/dev
diff --git a/bsdinstall/scripts/netconfig b/bsdinstall/scripts/netconfig
deleted file mode 100755
index f9913c324228..000000000000
--- a/bsdinstall/scripts/netconfig
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-# Copyright (c) 2011 The FreeBSD Foundation
-# All rights reserved.
-#
-# Portions of this software were developed by Bjoern Zeeb
-# under sponsorship from the FreeBSD Foundation.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-INTERFACES=""
-DIALOG_TAGS=""
-
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_HELP=2}
-: ${DIALOG_EXTRA=3}
-: ${DIALOG_ITEM_HELP=4}
-: ${DIALOG_ESC=255}
-
-for IF in `ifconfig -l`; do
-	test "$IF" = "lo0" && continue
-	(ifconfig -g wlan | egrep -wq $IF) && continue
-	INTERFACES="$INTERFACES $IF"
-done
-
-INTERFACES="$INTERFACES $(sysctl -in net.wlan.devices)"
-is_wireless_if() {
-	for IF in $(sysctl -in net.wlan.devices); do
-		if [ $IF = $1 ]; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-for IF in $INTERFACES; do
-	DESC=`sysctl -n dev.$(echo $IF | sed -E 's/([[:alpha:]]*)([[:digit:]]*)/\1.\2/g').%desc`
-	DIALOG_TAGS="$DIALOG_TAGS $IF \"$DESC\""
-done
-
-if [ -z "$INTERFACES" ]; then
-	dialog --backtitle 'FreeBSD Installer' \
-	    --title 'Network Configuration Error' \
-	    --msgbox 'No network interfaces present to configure.' 0 0
-	exit 1
-fi
-
-exec 3>&1
-INTERFACE=`echo $DIALOG_TAGS | xargs dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --menu 'Please select a network interface to configure:' 0 0 0 2>&1 1>&3`
-if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
-exec 3>&-
-
-: > $BSDINSTALL_TMPETC/._rc.conf.net
-
-IFCONFIG_PREFIX=""
-if is_wireless_if $INTERFACE; then
-	NEXT_WLAN_IFACE=wlan0	# XXX
-	echo wlans_$INTERFACE=\"$NEXT_WLAN_IFACE\" >> $BSDINSTALL_TMPETC/._rc.conf.net
-	IFCONFIG_PREFIX="WPA "
-	if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
-		ifconfig $NEXT_WLAN_IFACE create wlandev $INTERFACE
-		ifconfig $NEXT_WLAN_IFACE up
-	fi
-	bsdinstall wlanconfig $NEXT_WLAN_IFACE || exec $0
-	INTERFACE="$NEXT_WLAN_IFACE"
-fi
-
-IPV6_AVAIL=0
-IPV4_AVAIL=0
-sysctl -N kern.features.inet6 > /dev/null 2>&1
-case $? in
-0)	IPV6_AVAIL=1 ;;
-esac
-sysctl -N kern.features.inet > /dev/null 2>&1
-case $? in
-0)	IPV4_AVAIL=1 ;;
-esac
-
-if [ ${IPV4_AVAIL} -eq 1 ]; then
-	dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' \
-	    --yesno 'Would you like to configure IPv4 for this interface?' 0 0
-	if [ $? -eq $DIALOG_OK ]; then
-		bsdinstall netconfig_ipv4 ${INTERFACE} "${IFCONFIG_PREFIX}" || \
-		exec $0
-	else
-		IPV4_AVAIL=0
-	fi
-fi
-# In case wlanconfig left an option and we do not support IPv4 we need to write
-# it out on its own.  We cannot write it out with IPv6 as that suffix.
-if [ ${IPV4_AVAIL} -eq 0 -a -n ${IFCONFIG_PREFIX} ]; then
-	echo ifconfig_${INTERFACE}=\"${IFCONFIG_PREFIX}\" >> $BSDINSTALL_TMPETC/._rc.conf.net
-fi
-if [ ${IPV6_AVAIL} -eq 1 ]; then
-	dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' \
-	    --yesno 'Would you like to configure IPv6 for this interface?' 0 0
-	if [ $? -eq $DIALOG_OK ]; then
-		bsdinstall netconfig_ipv6 ${INTERFACE} || exec $0
-	else
-		IPV6_AVAIL=0
-	fi
-fi
-
-SEARCH=""
-IP4_1=""
-IP4_2=""
-IP6_1=""
-IP6_2=""
-while read key value; do
-	case "${key}" in
-	search)		SEARCH="${value}" ;;
-	nameserver)	# is more trick as we have to distinguish v4 and v6
-		case "${value}" in
-		[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*)
-			if [ -z "${IP4_1}" ] ; then
-				IP4_1="${value}"
-			elif [ -z "${IP4_2}" ]; then
-				IP4_2="${value}"
-			fi
-			;;
-		[0-9A-Fa-f:]*:*)
-			if [ -z "${IP6_1}" ] ; then
-				IP6_1="${value}"
-			elif [ -z "${IP6_2}" ]; then
-				IP6_2="${value}"
-			fi
-			;;
-		esac
-		;;
-	# ignore others
-	esac
-done < ${BSDINSTALL_TMPETC}/resolv.conf
-
-RESOLV=""
-if [ ${IPV6_AVAIL} -eq 1 -a ${IPV4_AVAIL} -eq 1 ];  then
-	RESOLV="
-	    'Search' 1 0 \"${SEARCH}\" 1 16 50 0 0
-	    'Nameserver' 2 0 \"Nameserver\" 2 16 50 0 2
-	    'IPv6 DNS #1' 2 0 \"${IP6_1}\" 2 16 50 0 0
-	    'IPv6 DNS #2' 3 0 \"${IP6_2}\" 3 16 50 0 0
-	    'IPv4 DNS #1' 4 0 \"${IP4_1}\" 4 16 16 0 0
-	    'IPv4 DNS #2' 5 0 \"${IP4_2}\" 5 16 16 0 0"
-elif [ ${IPV6_AVAIL} -eq 1 ]; then
-	RESOLV="
-	    'Search' 1 0 \"${SEARCH}\" 1 16 50 0 0
-	    'Nameserver' 2 0 \"Nameserver\" 2 16 50 0 2
-	    'IPv6 DNS #1' 2 0 \"${IP6_1}\" 2 16 50 0 0
-	    'IPv6 DNS #2' 3 0 \"${IP6_2}\" 3 16 50 0 0"
-elif [ ${IPV4_AVAIL} -eq 1 ]; then
-	RESOLV="
-	    'Search' 1 0 \"${SEARCH}\" 1 16 50 0 0
-	    'Nameserver' 2 0 \"Nameserver\" 2 16 50 0 2
-	    'IPv4 DNS #1' 2 0 \"${IP4_1}\" 2 16 16 0 0
-	    'IPv4 DNS #2' 3 0 \"${IP4_2}\" 3 16 16 0 0"
-else
-	exit 0
-fi
-
-exec 3>&1
-RESOLV=$(echo "${RESOLV}" | xargs dialog --backtitle 'FreeBSD Installer' \
-	--title 'Network Configuration' \
-	--mixedform 'Resolver Configuration' 0 0 0 \
-2>&1 1>&3)
-if [ $? -eq $DIALOG_CANCEL ]; then exec $0; fi
-exec 3>&-
-
-echo ${RESOLV} | tr ' ' '\n' | \
-awk '
-BEGIN {
-	search=-1;
-}
-{
-	if (/^[[:space:]]+$/) {
-		next;
-	}
-	if (/^Nameserver$/) {
-		printf "\n";
-		search=0;
-		next;
-	}
-	if (search == -1) {
-		printf "search ";
-		search=1;
-	}
-	if (search > 0) {
-		printf "%s%s", (search > 1) ? " " : "", $1;
-		search++;
-		next;
-	}
-	printf "nameserver %s\n", $1;
-}' > ${BSDINSTALL_TMPETC}/resolv.conf
-
-mv $BSDINSTALL_TMPETC/._rc.conf.net $BSDINSTALL_TMPETC/rc.conf.net
diff --git a/bsdinstall/scripts/netconfig_ipv4 b/bsdinstall/scripts/netconfig_ipv4
deleted file mode 100755
index 2acd9029d150..000000000000
--- a/bsdinstall/scripts/netconfig_ipv4
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2013-2015 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-
-############################################################ MAIN
-
-INTERFACE=$1
-IFCONFIG_PREFIX="$2"
-test -z "$IFCONFIG_PREFIX" || IFCONFIG_PREFIX="$2 "
-case "${INTERFACE}" in
-"")	dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' \
-	    --msgbox 'No interface specified for IPv4 configuration.' 0 0
-	exit 1
-	;;
-esac
-
-dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0
-if [ $? -eq $DIALOG_OK ]; then
-	if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
-		ifconfig $INTERFACE up
-		dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0
-		err=$( pkill -F /var/run/dhclient/dhclient.${INTERFACE}.pid; dhclient $INTERFACE 2>&1 )
-		if [ $? -ne 0 ]; then
-			f_dprintf "%s" "$err"
-			dialog --backtitle 'FreeBSD Installer' --msgbox "DHCP lease acquisition failed." 0 0
-			exec $0 ${INTERFACE} "${IFCONFIG_PREFIX}"
-		fi
-	fi
-	echo ifconfig_$INTERFACE=\"${IFCONFIG_PREFIX}DHCP\" >> $BSDINSTALL_TMPETC/._rc.conf.net
-	exit 0
-fi
-
-IP_ADDRESS=`ifconfig $INTERFACE inet | awk '/inet/ {printf("%s\n", $2); }'`
-NETMASK=`ifconfig $INTERFACE inet | awk '/inet/ {printf("%s\n", $4); }'`
-ROUTER=`netstat -rn -f inet | awk '/default/ {printf("%s\n", $2);}'`
-
-exec 3>&1
-IF_CONFIG=$(dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --form 'Static Network Interface Configuration' 0 0 0 \
-	'IP Address' 1 0 "$IP_ADDRESS" 1 20 16 0 \
-	'Subnet Mask' 2 0 "$NETMASK" 2 20 16 0 \
-	'Default Router' 3 0 "$ROUTER" 3 20 16 0 \
-2>&1 1>&3)
-if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
-exec 3>&-
-
-echo $INTERFACE $IF_CONFIG |
-    awk -v prefix="$IFCONFIG_PREFIX" '{
-	printf("ifconfig_%s=\"%s\inet %s netmask %s\"\n", $1, prefix, $2, $3);
-	printf("defaultrouter=\"%s\"\n", $4);
-    }' >> $BSDINSTALL_TMPETC/._rc.conf.net
-retval=$?
-
-if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
-	. $BSDINSTALL_TMPETC/._rc.conf.net
-	if [ -n "$2" ]; then
-		ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE | sed "s|$2||"`
-	else
-		ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE`
-	fi
-	if [ "$defaultrouter" ]; then
-		route delete -inet default
-		route add -inet default $defaultrouter
-		retval=$?
-	fi
-fi
-
-exit $retval
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/netconfig_ipv6 b/bsdinstall/scripts/netconfig_ipv6
deleted file mode 100755
index abc53906f4ad..000000000000
--- a/bsdinstall/scripts/netconfig_ipv6
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2011 The FreeBSD Foundation
-# Copyright (c) 2013-2015 Devin Teske
-# All rights reserved.
-#
-# Portions of this software were developed by Bjoern Zeeb
-# under sponsorship from the FreeBSD Foundation.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-
-############################################################ MAIN
-
-#
-# TODO:
-# - Add DHCPv6 support once FreeBSD ships with it.
-#
-
-INTERFACE=$1
-case "${INTERFACE}" in
-"")	dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' \
-	    --msgbox 'No interface specified for IPv6 configuration.' 0 0
-	exit 1
-	;;
-esac
-
-AGAIN=""
-while : ; do
-	MSG="Would you like to try stateless address autoconfiguration (SLAAC)${AGAIN}?"
-	dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' \
-	    --yesno "${MSG}" 0 0
-	if [ $? -eq $DIALOG_OK ]; then
-		if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
-			dialog --backtitle 'FreeBSD Installer' \
-			    --infobox "Sending Router Solicitation ..." 0 0
-			ifconfig ${INTERFACE} inet6 -ifdisabled accept_rtadv up
-			err=$( rtsol -F $INTERFACE 2>&1 )
-			if [ $? -ne 0 ]; then
-				f_dprintf "%s" "$err"
-				dialog --backtitle 'FreeBSD Installer' --msgbox "SLAAC failed." 0 0
-				AGAIN=" again"
-				continue
-			fi
-		fi
-		echo ifconfig_${INTERFACE}_ipv6=\"inet6 accept_rtadv\" >> $BSDINSTALL_TMPETC/._rc.conf.net
-		exit 0
-	else
-		break
-	fi
-done
-
-ROUTER6=`netstat -Wrn -f inet6 | awk '/default/ {printf("%s\n", $2);}'`
-ADDRS=`ifconfig ${INTERFACE} inet6 | \
-awk  -v dfr="${ROUTER6}" '
-BEGIN {
-	n=0;
-}
-{
-	if (/inet6/) {
-		if (match($2, "^fe80:")) { next; };
-		# For the moment ignore all but the first address; it might confuse the user.
-		if (n > 0) { next; };
-		n++;
-		printf "\"IPv6 Address\" %d 0 \"%s/%s\" %d 16 50 0 0 ", n, $2, $4, n;
-	}
-}
-END {
-	if (n == 0) {
-		n++;
-		printf "\"IPv6 Address\" %d 0 \"\" %d 16 50 0 0 ", n, n;
-	}
-	n++;
-	# Nasty trick adding a (hidden, same y) read-only field as a marker
-	# to separate interface address(es) from the default router.
-	printf "\"Default Router\" %d 0 \"%s\" %d 16 50 0 2 ", n, "DefaultRouter", n;
-	printf "\"Default Router\" %d 0 \"%s\" %d 16 50 0 0 ", n, dfr, n;
-}'`
-
-exec 3>&1
-IF_CONFIG=$(echo ${ADDRS} | xargs dialog --backtitle 'FreeBSD Installer' \
-	--title 'Network Configuration' \
-	--mixedform 'Static IPv6 Network Interface Configuration' 0 0 0 \
-2>&1 1>&3)
-if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
-exec 3>&-
-
-echo ${IF_CONFIG} | tr ' ' '\n' | \
-awk -v iface="${INTERFACE}" '
-BEGIN {
-	dfr=0;
-	count=0;
-}
-{
-	if (/^[[:space:]]+$/) {
-		next;
-	}
-	if (/DefaultRouter/) {
-		dfr=1;
-		next;
-	}
-	if (dfr == 1) {
-		printf("ipv6_defaultrouter=\"%s\"\n", $1);
-		next;
-	}
-	if (count > 0) {
-		# Ignore all but the first IP address for now.
-		next;
-	}
-	count++;
-	if (!match($1, "/")) {
-		sub("$", "/64", $1);
-	}
-	printf("ifconfig_%s_ipv6=\"inet6 %s\"\n", iface, $1);
-}' >> $BSDINSTALL_TMPETC/._rc.conf.net
-retval=$?
-
-if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
-	. $BSDINSTALL_TMPETC/._rc.conf.net
-	ifconfig ${INTERFACE} `eval echo \\\$ifconfig_${INTERFACE}_ipv6`
-	if [ "$ipv6_defaultrouter" ]; then
-		route delete -inet6 default
-		route add -inet6 default ${ipv6_defaultrouter}
-		retval=$?
-	fi
-fi
-
-exit $retval
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/rootpass b/bsdinstall/scripts/rootpass
deleted file mode 100755
index 7764a51b62fb..000000000000
--- a/bsdinstall/scripts/rootpass
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-clear
-echo "FreeBSD Installer"
-echo "========================"
-echo
-
-echo "Please select a password for the system management account (root):"
-echo "Typed characters will not be visible."
-
-chroot $BSDINSTALL_CHROOT passwd root 2>&1
diff --git a/bsdinstall/scripts/script b/bsdinstall/scripts/script
deleted file mode 100755
index 8d9dd5205132..000000000000
--- a/bsdinstall/scripts/script
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2013 Nathan Whitehorn
-# Copyright (c) 2013-2015 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/variable.subr
-
-############################################################ CONFIGURATION
-
-# VARIABLES:
-# PARTITIONS
-# DISTRIBUTIONS
-# BSDINSTALL_DISTDIR
-
-#
-# Default name of the ZFS boot-pool
-#
-: ${ZFSBOOT_POOL_NAME:=zroot}
-
-############################################################ GLOBALS
-
-: ${TMPDIR:="/tmp"}
-
-#
-# Strings that should be moved to an i18n file and loaded with f_include_lang()
-#
-msg_installation_error="Installation Error!"
-
-############################################################ FUNCTIONS
-
-error()
-{
-	local file
-	f_getvar "$VAR_DEBUG_FILE#+" file
-	if [ "$file" ]; then
-		f_dialog_title "$msg_installation_error"
-		f_dialog_textbox "$file"
-		# No need to restore title, pining for the fjords
-	fi
-
-	[ -f "$PATH_FSTAB" ] || exit
-	if [ "$ZFSBOOT_DISKS" ]; then
-		zpool export $ZFSBOOT_POOL_NAME
-	else
-		bsdinstall umount
-	fi
-
-	exit 1
-}
-
-############################################################ MAIN
-
-set -e
-trap error EXIT
-
-SCRIPT="$1"
-shift
-
-f_dprintf "Began Installation at %s" "$( date )"
-rm -rf $BSDINSTALL_TMPETC
-mkdir $BSDINSTALL_TMPETC
-
-split -a 2 -p '^#!.*' "$SCRIPT" $TMPDIR/bsdinstall-installscript-
-
-. $TMPDIR/bsdinstall-installscript-aa
-: ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS
-export BSDINSTALL_DISTDIR
-
-# Re-initialize a new log if preamble changed BSDINSTALL_LOG
-if [ "$BSDINSTALL_LOG" != "${debugFile#+}" ]; then
-	export debugFile="$BSDINSTALL_LOG"
-	f_quietly f_debug_init
-	# NB: Being scripted, let debug go to terminal for invalid debugFile
-	f_dprintf "Began Installation at %s" "$( date )"
-fi
-
-# Make partitions
-rm -f $PATH_FSTAB
-touch $PATH_FSTAB
-if [ "$ZFSBOOT_DISKS" ]; then
-	bsdinstall zfsboot
-else
-	bsdinstall scriptedpart "$PARTITIONS"
-fi
-bsdinstall mount
-
-# Fetch missing distribution files, if any
-exec 3>&1
-export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&3)
-FETCH_RESULT=$?
-exec 3>&-
-
-[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions"
-
-# Unpack distributions
-bsdinstall checksum
-if [ -t 0 ]; then
-	# If install is a tty, use distextract as normal
-	bsdinstall distextract
-else
-	# Otherwise, we need to use tar (see https://reviews.freebsd.org/D10736)
-	for set in $DISTRIBUTIONS; do
-		f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set"
-		# XXX: The below fails if any mountpoints are FAT, due to
-		# inability to set ctime/mtime on the root of FAT partitions,
-		# which is needed to support e.g. EFI system partitions. tar has
-		# no option to ignore this (distextract ignores them internally
-		# through a hack), and returns 1 on any warning or error,
-		# effectively turning all warnings into fatal errors.
-		# 
-		# Work around this in an extremely lame way for the specific
-		# case of EFI system partitions only. This *ONLY WORKS* if
-		# /boot/efi is empty and does not handle analagous problems on
-		# other systems (ARM, PPC64).
-		tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi
-		mkdir -p $BSDINSTALL_CHROOT/boot/efi
-	done
-fi
-
-# Configure bootloader if needed
-bsdinstall bootconfig
-
-# Finalize install
-bsdinstall config
-
-# Make sure networking is functional, if we can arrange that
-if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then
-	cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf
-fi
-
-# Run post-install script
-if [ -f $TMPDIR/bsdinstall-installscript-ab ]; then
-	cp $TMPDIR/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/tmp/installscript
-	chmod a+x $BSDINSTALL_CHROOT/tmp/installscript
-	chroot $BSDINSTALL_CHROOT /tmp/installscript $@ 2>&1
-	rm $BSDINSTALL_CHROOT/tmp/installscript
-fi
-
-bsdinstall entropy
-if [ "$ZFSBOOT_DISKS" ]; then
-	zpool export $ZFSBOOT_POOL_NAME
-fi
-bsdinstall umount
-
-f_dprintf "Installation Completed at %s" "$( date )"
-
-trap - EXIT
-exit $SUCCESS
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/services b/bsdinstall/scripts/services
deleted file mode 100755
index c59628b2a88c..000000000000
--- a/bsdinstall/scripts/services
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-: ${DIALOG_OK=0}
-
-if [ -f $BSDINSTALL_TMPETC/rc.conf.services ]; then
-	eval $( sed -e s/YES/on/i -e s/NO/off/i \
-		$BSDINSTALL_TMPETC/rc.conf.services )
-else
-	# Default service states. Everything is off if not enabled.
-	sshd_enable="on"
-fi
-
-echo -n > $BSDINSTALL_TMPETC/rc.conf.services
-
-exec 3>&1
-DAEMONS=$( dialog --backtitle "FreeBSD Installer" \
-    --title "System Configuration" --nocancel --separate-output \
-    --checklist "Choose the services you would like to be started at boot:" \
-    0 0 0 \
-	local_unbound "Local caching validating resolver" ${local_unbound:-off} \
-	sshd	"Secure shell daemon" ${sshd_enable:-off} \
-	moused	"PS/2 mouse pointer on console" ${moused_enable:-off} \
-	ntpdate	"Synchronize system and network time at bootime" \
-		${ntpdate_enable:-off} \
-	ntpd	"Synchronize system and network time" ${ntpd_enable:-off} \
-	powerd	"Adjust CPU frequency dynamically if supported" \
-		${powerd_enable:-off} \
-	dumpdev "Enable kernel crash dumps to /var/crash" ${dumpdev:-on} \
-2>&1 1>&3 )
-exec 3>&-
-
-havedump=
-for daemon in $DAEMONS; do
-	[ "$daemon" = "dumpdev" ] && havedump=1 continue
-	echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services
-done
-
-echo '# Set dumpdev to "AUTO" to enable crash dumps, "NO"' \
-     'to disable' >> $BSDINSTALL_TMPETC/rc.conf.services
-if [ "$havedump" ]; then
-	echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
-else
-	echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services
-fi
diff --git a/bsdinstall/scripts/time b/bsdinstall/scripts/time
deleted file mode 100755
index 0e6b32adc6b1..000000000000
--- a/bsdinstall/scripts/time
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-# Select timezone
-chroot $BSDINSTALL_CHROOT tzsetup
-
-# Switch to target timezone
-saved_TZ="$TZ"
-TZ="${BSDINSTALL_CHROOT}/etc/localtime"
-export TZ
-
-# Set date
-exec 3>&1
-DATE=$(../../bsddialog --backtitle 'FreeBSD Installer' \
-	--title 'Time & Date' \
-	--ok-label 'Set Date' \
-	--cancel-label 'Skip' \
-	--defaultno \
-	--date-format '%Y%m%d%H%M.%S' \
-	--datebox '' 0 40 \
-2>&1 1>&3) && date $DATE
-exec 3>&-
-
-# Set time
-exec 3>&1
-TIME=$(../../bsddialog --backtitle 'FreeBSD Installer' \
-	--title 'Time & Date' \
-	--ok-label 'Set Time' \
-	--cancel-label 'Skip' \
-	--defaultno \
-	--time-format '%H%M.%S' \
-	--timebox '' 0 40 \
-2>&1 1>&3) && date $TIME
-exec 3>&-
-
-# Switch back
-if [ -n "$saved_TZ" ]; then
-	TZ="$saved_TZ"
-else
-	unset TZ
-fi
-unset saved_TZ
diff --git a/bsdinstall/scripts/umount b/bsdinstall/scripts/umount
deleted file mode 100755
index 3c33eff7e105..000000000000
--- a/bsdinstall/scripts/umount
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-
-TMP_FSTAB=${TMPDIR:-"/tmp"}/bsdinstall-tmp-fstab
-
-cat $PATH_FSTAB | awk -v BSDINSTALL_CHROOT=$BSDINSTALL_CHROOT '{
-	if ($2 ~ "^/.*") {
-		fsname = $2;
-		if (fsname == "/")
-			fsname = ""
-		printf("%s\t%s%s\t%s\t%s\t%s\t%s\n", $1, BSDINSTALL_CHROOT,
-		    fsname, $3, $4, $5, $6);
-	}
-}' > $TMP_FSTAB
-
-umount $BSDINSTALL_CHROOT/dev 2>/dev/null
-if [ -n "$TMP_FSTAB" ]; then
-	umount -F $TMP_FSTAB -a 2>/dev/null
-fi
diff --git a/bsdinstall/scripts/wlanconfig b/bsdinstall/scripts/wlanconfig
deleted file mode 100755
index c2234831be9d..000000000000
--- a/bsdinstall/scripts/wlanconfig
+++ /dev/null
@@ -1,365 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# Copyright (c) 2013-2020 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_include $BSDCFG_SHARE/dialog.subr
-f_dialog_backtitle "FreeBSD Installer"
-
-############################################################ FUNCTIONS
-
-country_set()
-{
-	local error_str iface_up ifconfig_args=
-
-	#
-	# Setup what was selected
-	# NB: Do not change order of arguments (or regdomain will be ignored)
-	#
-	[ "$2" ] && ifconfig_args="$ifconfig_args country $2"
-	[ "$1" ] && ifconfig_args="$ifconfig_args regdomain $1"
-	[ "$ifconfig_args" ] || return $SUCCESS # Nothing to do
-	ifconfig_args="${ifconfig_args# }"
-
-	# Regdomain/country cannot be applied while interface is running
-	iface_up=$( ifconfig -lu | grep -w "$WLAN_IFACE" )
-	[ "$iface_up" ] && ifconfig "$WLAN_IFACE" down
-	f_eval_catch -dk error_str wlanconfig ifconfig "ifconfig %s %s" \
-		"$WLAN_IFACE" "$ifconfig_args"
-	error_str="${error_str#ifconfig: }"
-	# Restart wpa_supplicant(8) (should not fail).
-	[ "$iface_up" ] && f_eval_catch -d wlanconfig wpa_supplicant \
-		'wpa_supplicant -B -i "%s" -c "%s/wpa_supplicant.conf"' \
-		"$WLAN_IFACE" "$BSDINSTALL_TMPETC"
-	if [ "$error_str" ]; then
-		$DIALOG --title "$msg_error" \
-			--backtitle "$DIALOG_BACKTITLE" \
-			--yes-label Change \
-			--no-label Ignore \
-			--yesno \
-			"Error while applying chosen settings ($error_str)" \
-			0 0 || return $SUCCESS # Skip
-		return $FAILURE # Restart
-	else
-		cat > "$BSDINSTALL_TMPETC/rc.conf.net.wlan" <<-EOF
-		create_args_$WLAN_IFACE="$ifconfig_args"
-		EOF
-	fi
-
-	return $SUCCESS
-}
-
-dialog_country_select()
-{
-	local input regdomains countries regdomain country prompt
-	local no_default="<not selected>"
-	local default_regdomain="${1:-$no_default}"
-	local default_country="${2:-$no_default}"
-
-	#
-	# Parse available countries/regdomains
-	#
-	input=$( ifconfig "$WLAN_IFACE" list countries | sed -e 's/DEBUG//gi' )
-	regdomains=$( echo "$input" | awk '
-		sub(/.*domains:/, ""), /[^[:alnum:][[:space:]]/ {
-			n = split($0, domains)
-			for (i = 1; i <= n; i++)
-				printf "'\''%s'\'' '\'\''", domains[i]
-		}
-	' | sort )
-	countries=$( echo "$input" | awk '
-		sub(/Country codes:/, ""), sub(/Regulatory.*/, "") {
-			while (match($0, /[[:upper:]][[:upper:][:digit:]] /)) {
-				country = substr($0, RSTART)
-				sub(/ [[:upper:]][[:upper:][:digit:]].*/, "",
-					country)
-				code = substr(country, 1, 2)
-				desc = substr(country, 4)
-				sub(/[[:space:]]*$/, "", desc)
-				printf "'\''%s'\'' '\''%s'\''\n", code, desc
-				$0 = substr($0, RSTART + RLENGTH)
-			}
-		}
-	' | sort )
-
-	f_dialog_title "Regdomain selection"
-	prompt="Select your regdomain."
-	eval f_dialog_menu_size height width rows \
-		\"\$DIALOG_TITLE\" \"\$DIALOG_BACKTITLE\" \
-		\"\$prompt\" \"\" $regdomains
-	regdomain=$( eval $DIALOG \
-		--title \"\$DIALOG_TITLE\"             \
-		--backtitle \"\$DIALOG_BACKTITLE\"     \
-		--cancel-label \"\$msg_skip\"          \
-		--default-item \"\$default_regdomain\" \
-		--menu \"\$prompt\"                    \
-		$height $width $rows                   \
-		$regdomains                            \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	)
-	f_dialog_data_sanitize regdomain
-
-	f_dialog_title "Country selection"
-	prompt="Select your country."
-	eval f_dialog_menu_size height width rows \
-		\"\$DIALOG_TITLE\" \"\$DIALOG_BACKTITLE\" \
-		\"\$prompt\" \"\" $countries
-	country=$( eval $DIALOG \
-		--title \"\$DIALOG_TITLE\"           \
-		--backtitle \"\$DIALOG_BACKTITLE\"   \
-		--cancel-label \"\$msg_skip\"        \
-		--default-item \"\$default_country\" \
-		--menu \"\$prompt\"                  \
-		$height $width $rows                 \
-		$countries                           \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	)
-	f_dialog_data_sanitize country
-
-	country_set "$regdomain" "$country"
-}
-
-############################################################ MAIN
-
-: > "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
-chmod 0600 "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
-
-cat >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF
-ctrl_interface=/var/run/wpa_supplicant
-eapol_version=2
-ap_scan=1
-fast_reauth=1
-
-EOF
-
-#
-# Try to reach wpa_supplicant. If it isn't running and we can modify the
-# existing system, start it. Otherwise, fail.
-#
-if ! f_eval_catch -d wlanconfig wpa_cli "wpa_cli ping"; then
-	if [ ! "$BSDINSTALL_CONFIGCURRENT" ]; then
-		f_show_err "Wireless cannot be configured without %s" \
-		           "making changes to the local system!"
-		exit 1
-	fi
-	f_eval_catch wlanconfig wpa_supplicant \
-		'wpa_supplicant -B -i "%s" -c "%s/wpa_supplicant.conf"' \
-		"$1" "$BSDINSTALL_TMPETC" || exit 1
-
-	# See if we succeeded
-	f_eval_catch wlanconfig wpa_cli "wpa_cli ping" || exit 1
-fi
-
-#
-# There is no way to check country/regdomain without (possible)
-# interface state modification
-#
-if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
-	# Get current country/regdomain for selected interface
-	WLAN_IFACE=$( wpa_cli ifname | tail -n 1 )
-	INPUT=$( ifconfig "$WLAN_IFACE" list regdomain | head -n 1 )
-	DEF_REGDOMAIN=$( echo "$INPUT" | cut -w -f 2 )
-	DEF_COUNTRY=$( echo "$INPUT" | cut -w -f 4 )
-	[ "$DEF_REGDOMAIN" = 0 ] && DEF_REGDOMAIN="<not selected>"
-	[ "$DEF_COUNTRY" = 0 ] && DEF_COUNTRY="<not selected>"
-	f_dialog_title "Regdomain/country"
-	if f_yesno "Change regdomain/country ($DEF_REGDOMAIN/$DEF_COUNTRY)?"
-	then
-		while ! dialog_country_select "$DEF_REGDOMAIN" "$DEF_COUNTRY"
-		do :; done
-	fi
-fi
-
-while :; do
-	SCANSSID=0
-	f_eval_catch -d wlanconfig wpa_cli "wpa_cli scan"
-	f_dialog_title "Scanning"
-	f_dialog_pause "Waiting 5 seconds to scan for wireless networks..." 5 ||
-		exit 1
-
-	f_eval_catch -dk SCAN_RESULTS wlanconfig wpa_cli "wpa_cli scan_results"
-	NETWORKS=$( echo "$SCAN_RESULTS" | awk -F '\t' '
-		/..:..:..:..:..:../ && $5 { printf "\"%s\"\t\"%s\"\n", $5, $4 }
-	' | sort | uniq )
-
-	if [ ! "$NETWORKS" ]; then
-		f_dialog_title "$msg_error"
-		f_yesno "No wireless networks were found. Rescan?" && continue
-		exit 1
-	fi
-
-	f_dialog_title "Network Selection"
-	prompt="Select a wireless network to connect to."
-	f_dialog_menu_size height width rows "$DIALOG_TITLE" \
-		"$DIALOG_BACKTITLE" "$prompt" "" $menu_list
-	NETWORK=$( eval $DIALOG \
-		--title \"\$DIALOG_TITLE\"         \
-		--backtitle \"\$DIALOG_BACKTITLE\" \
-		--extra-button                     \
-		--extra-label \"Rescan\"           \
-		--menu \"\$prompt\"                \
-		$height $width $rows               \
-		$NETWORKS                          \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	)
-	retval=$?
-	f_dialog_data_sanitize NETWORK
-	case $retval in
-	$DIALOG_OK) break ;;
-	$DIALOG_CANCEL)
-		# Ask if the user wants to select network manually
-		f_dialog_title "Network Selection"
-		f_yesno "Do you want to select the network manually?" || exit 1
-		f_dialog_input NETWORK "Enter SSID" || exit 1
-		prompt="Select encryption type"
-		menu_list="
-			'1 WPA/WPA2 PSK' ''
-			'2 WPA/WPA2 EAP' ''
-			'3 WEP' ''
-			'0 None' ''
-		" # END-QUOTE
-		eval f_dialog_menu_size height width rows \"\$DIALOG_TITLE\" \
-			\"\$DIALOG_BACKTITLE\" \"\$prompt\" \"\" $menu_list
-		ENCRYPTION=$( eval $DIALOG \
-			--title \"\$DIALOG_TITLE\"         \
-			--backtitle \"\$DIALOG_BACKTITLE\" \
-			--menu \"\$prompt\"                \
-			$height $width $rows               \
-			$menu_list                         \
-			2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-		) || exit 1
-		SCANSSID=1
-		break
-		;;
-	$DIALOG_EXTRA) # Rescan
-		;;
-	esac
-done
-
-[ "$ENCRYPTION" ] || ENCRYPTION=$( echo "$NETWORKS" |
-	awk -F '\t' "/^\"$NETWORK\"\t/ { print \$2 }" )
-
-if echo "$ENCRYPTION" | grep -q PSK; then
-	PASS=$( $DIALOG \
-		--title "WPA Setup"              \
-		--backtitle "$DIALOG_BACKTITLE"  \
-		--insecure                       \
-		--mixedform ""                   \
-		0 0 0                            \
-		"SSID" 1 0 "$NETWORK" 1 12 0 0 2 \
-		"Password" 2 0 "" 2 12 15 63 1   \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	) || exec "$0" "$@"
-	awk 'sub(/^\\/,"")||1' \
-		>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
-	network={
-	\	ssid="$NETWORK"
-	\	scan_ssid=$SCANSSID
-	\	psk="$PASS"
-	\	priority=5
-	}
-	EOF
-elif echo "$ENCRYPTION" | grep -q EAP; then
-	USERPASS=$( $DIALOG \
-		--title "WPA-Enterprise Setup"   \
-		--backtitle "$DIALOG_BACKTITLE"  \
-		--insecure                       \
-		--mixedform ""                   \
-		0 0 0                            \
-		"SSID" 1 0 "$NETWORK" 1 12 0 0 2 \
-		"Username" 2 0 "" 2 12 25 63 0   \
-		"Password" 3 0 "" 3 12 25 63 1   \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	) || exec "$0" "$@"
-	awk 'sub(/^\\/,"")||1' \
-		>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
-	network={
-	\	ssid="$NETWORK"
-	\	scan_ssid=$SCANSSID
-	\	key_mgmt=WPA-EAP$(
-		echo "$USERPASS" | awk '
-			NR == 1 { printf "\n\tidentity=\"%s\"", $1 }
-			NR == 2 { printf "\n\tpassword=\"%s\"", $1 }
-		' )
-	\	priority=5
-	}
-	EOF
-elif echo "$ENCRYPTION" | grep -q WEP; then
-	WEPKEY=$( $DIALOG \
-		--title "WEP Setup"              \
-		--backtitle "$DIALOG_BACKTITLE"  \
-		--insecure                       \
-		--mixedform ""                   \
-		0 0 0                            \
-		"SSID" 1 0 "$NETWORK" 1 12 0 0 2 \
-		"WEP Key 0" 2 0 "" 2 12 15 0 1   \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	) || exec "$0" "$@"
-	awk 'sub(/^\\/,"")||1' \
-		>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
-	network={
-	\	ssid="$NETWORK"
-	\	scan_ssid=$SCANSSID
-	\	key_mgmt=NONE
-	\	wep_key0="$WEPKEY"
-	\	wep_tx_keyidx=0
-	\	priority=5
-	}
-	EOF
-else # Open
-	awk 'sub(/^\\/,"")||1' \
-		>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
-	network={
-	\	ssid="$NETWORK"
-	\	scan_ssid=$SCANSSID
-	\	key_mgmt=NONE
-	\	priority=5
-	}
-	EOF
-fi
-
-# Connect to any open networks policy
-cat >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF
-network={
-	priority=0
-	key_mgmt=NONE
-}
-EOF
-
-# Bring up new network
-[ "$BSDINSTALL_CONFIGCURRENT" ] &&
-	f_eval_catch -d wlanconfig wpa_cli "wpa_cli reconfigure"
-
-exit $SUCCESS
-
-################################################################################
-# END
-################################################################################
diff --git a/bsdinstall/scripts/zfsboot b/bsdinstall/scripts/zfsboot
deleted file mode 100755
index 45c8b001c393..000000000000
--- a/bsdinstall/scripts/zfsboot
+++ /dev/null
@@ -1,1814 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2013-2016 Allan Jude
-# Copyright (c) 2013-2018 Devin Teske
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/device.subr
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/password/password.subr
-f_include $BSDCFG_SHARE/variable.subr
-
-############################################################ CONFIGURATION
-
-#
-# Default name of the boot-pool
-#
-: ${ZFSBOOT_POOL_NAME:=zroot}
-
-#
-# Default pool size is optional
-#
-: ${ZFSBOOT_POOL_SIZE=}
-
-#
-# Default options to use when creating zroot pool
-#
-: ${ZFSBOOT_POOL_CREATE_OPTIONS:=-O compress=lz4 -O atime=off}
-
-#
-# Default name for the boot environment parent dataset
-#
-: ${ZFSBOOT_BEROOT_NAME:=ROOT}
-
-#
-# Default name for the primary boot environment
-#
-: ${ZFSBOOT_BOOTFS_NAME:=default}
-
-#
-# Default Virtual Device (vdev) type to create
-#
-: ${ZFSBOOT_VDEV_TYPE:=stripe}
-
-#
-# Should we use sysctl(8) vfs.zfs.min_auto_ashift=12 to force 4K sectors?
-#
-: ${ZFSBOOT_FORCE_4K_SECTORS:=1}
-
-#
-# Should we use geli(8) to encrypt the drives?
-# NB: Automatically enables ZFSBOOT_BOOT_POOL
-#
-: ${ZFSBOOT_GELI_ENCRYPTION=}
-
-#
-# Default path to the geli(8) keyfile used in drive encryption
-#
-: ${ZFSBOOT_GELI_KEY_FILE:=/boot/encryption.key}
-
-#
-# Create a separate boot pool?
-# NB: Automatically set when using geli(8) or MBR
-#
-: ${ZFSBOOT_BOOT_POOL=}
-
-#
-# Options to use when creating separate boot pool (if any)
-#
-: ${ZFSBOOT_BOOT_POOL_CREATE_OPTIONS:=}
-
-#
-# Default name for boot pool when enabled (e.g., geli(8) or MBR)
-#
-: ${ZFSBOOT_BOOT_POOL_NAME:=bootpool}
-
-#
-# Default size for boot pool when enabled (e.g., geli(8) or MBR)
-#
-: ${ZFSBOOT_BOOT_POOL_SIZE:=2g}
-
-#
-# Default disks to use (always empty unless being scripted)
-#
-: ${ZFSBOOT_DISKS:=}
-
-#
-# Default partitioning scheme to use on disks
-#
-: ${ZFSBOOT_PARTITION_SCHEME:=}
-
-#
-# Default boot type to use on disks
-#
-: ${ZFSBOOT_BOOT_TYPE:=}
-
-#
-# How much swap to put on each block device in the boot zpool
-# NOTE: Value passed to gpart(8); which supports SI unit suffixes.
-#
-: ${ZFSBOOT_SWAP_SIZE:=2g}
-
-#
-# Should we use geli(8) to encrypt the swap?
-#
-: ${ZFSBOOT_SWAP_ENCRYPTION=}
-
-#
-# Should we use gmirror(8) to mirror the swap?
-#
-: ${ZFSBOOT_SWAP_MIRROR=}
-
-#
-# Default ZFS datasets for root zpool
-#
-# NOTE: Requires /tmp, /var/tmp, /$ZFSBOOT_BOOTFS_NAME/$ZFSBOOT_BOOTFS_NAME
-# NOTE: Anything after pound/hash character [#] is ignored as a comment.
-#
-f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS="
-	# DATASET	OPTIONS (comma or space separated; or both)
-
-	# Boot Environment [BE] root and default boot dataset
-	/$ZFSBOOT_BEROOT_NAME				mountpoint=none
-	/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME	mountpoint=/
-
-	# Compress /tmp, allow exec but not setuid
-	/tmp		mountpoint=/tmp,exec=on,setuid=off
-
-	# Don't mount /usr so that 'base' files go to the BEROOT
-	/usr		mountpoint=/usr,canmount=off
-
-	# Home directories separated so they are common to all BEs
-	/usr/home	# NB: /home is a symlink to /usr/home
-
-	# Ports tree
-	/usr/ports	setuid=off
-
-	# Source tree (compressed)
-	/usr/src
-
-	# Create /var and friends
-	/var		mountpoint=/var,canmount=off
-	/var/audit	exec=off,setuid=off
-	/var/crash	exec=off,setuid=off
-	/var/log	exec=off,setuid=off
-	/var/mail	atime=on
-	/var/tmp	setuid=off
-" # END-QUOTE
-
-#
-# If interactive and the user has not explicitly chosen a vdev type or disks,
-# make the user confirm scripted/default choices when proceeding to install.
-#
-: ${ZFSBOOT_CONFIRM_LAYOUT:=1}
-
-############################################################ GLOBALS
-
-#
-# Format of a line in printf(1) syntax to add to fstab(5)
-#
-FSTAB_FMT="%s\t\t%s\t%s\t%s\t\t%s\t%s\n"
-
-#
-# Command strings for various tasks
-#
-COPY='cp "%s" "%s"'
-CHMOD_MODE='chmod %s "%s"'
-DD_WITH_OPTIONS='dd if="%s" of="%s" %s'
-ECHO_APPEND='echo "%s" >> "%s"'
-ECHO_OVERWRITE='echo "%s" > "%s"'
-GELI_ATTACH='geli attach -j - -k "%s" "%s"'
-GELI_ATTACH_NOKEY='geli attach -j - "%s"'
-GELI_DETACH_F='geli detach -f "%s"'
-GELI_PASSWORD_INIT='geli init -b -B "%s" -e %s -J - -K "%s" -l 256 -s 4096 "%s"'
-GELI_PASSWORD_GELIBOOT_INIT='geli init -bg -e %s -J - -l 256 -s 4096 "%s"'
-GPART_ADD_ALIGN='gpart add %s -t %s "%s"'
-GPART_ADD_ALIGN_INDEX='gpart add %s -i %s -t %s "%s"'
-GPART_ADD_ALIGN_INDEX_WITH_SIZE='gpart add %s -i %s -t %s -s %s "%s"'
-GPART_ADD_ALIGN_LABEL='gpart add %s -l %s -t %s "%s"'
-GPART_ADD_ALIGN_LABEL_WITH_SIZE='gpart add %s -l %s -t %s -s %s "%s"'
-GPART_BOOTCODE='gpart bootcode -b "%s" "%s"'
-GPART_BOOTCODE_PART='gpart bootcode -b "%s" -p "%s" -i %s "%s"'
-GPART_BOOTCODE_PARTONLY='gpart bootcode -p "%s" -i %s "%s"'
-GPART_CREATE='gpart create -s %s "%s"'
-GPART_DESTROY_F='gpart destroy -F "%s"'
-GPART_SET_ACTIVE='gpart set -a active -i %s "%s"'
-GPART_SET_LENOVOFIX='gpart set -a lenovofix "%s"'
-GPART_SET_PMBR_ACTIVE='gpart set -a active "%s"'
-GRAID_DELETE='graid delete "%s"'
-KLDLOAD='kldload %s'
-LN_SF='ln -sf "%s" "%s"'
-MKDIR_P='mkdir -p "%s"'
-MOUNT_TYPE='mount -t %s "%s" "%s"'
-NEWFS_ESP='newfs_msdos "%s"'
-PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s >> \"%s\""
-PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"'
-SHELL_TRUNCATE=':> "%s"'
-SWAP_GMIRROR_LABEL='gmirror label swap %s'
-SYSCTL_ZFS_MIN_ASHIFT_12='sysctl vfs.zfs.min_auto_ashift=12'
-UMOUNT='umount "%s"'
-ZFS_CREATE_WITH_OPTIONS='zfs create %s "%s"'
-ZFS_MOUNT='zfs mount "%s"'
-ZFS_SET='zfs set "%s" "%s"'
-ZFS_UNMOUNT='zfs unmount "%s"'
-ZPOOL_CREATE_WITH_OPTIONS='zpool create %s "%s" %s %s'
-ZPOOL_DESTROY='zpool destroy "%s"'
-ZPOOL_EXPORT='zpool export "%s"'
-ZPOOL_EXPORT_F='zpool export -f "%s"'
-ZPOOL_IMPORT_WITH_OPTIONS='zpool import %s "%s"'
-ZPOOL_LABELCLEAR_F='zpool labelclear -f "%s"'
-ZPOOL_SET='zpool set %s "%s"'
-
-#
-# Strings that should be moved to an i18n file and loaded with f_include_lang()
-#
-hline_alnum_arrows_punc_tab_enter="Use alnum, arrows, punctuation, TAB or ENTER"
-hline_arrows_space_tab_enter="Use arrows, SPACE, TAB or ENTER"
-hline_arrows_tab_enter="Press arrows, TAB or ENTER"
-msg_an_unknown_error_occurred="An unknown error occurred"
-msg_back="Back"
-msg_cancel="Cancel"
-msg_change_selection="Change Selection"
-msg_configure_options="Configure Options:"
-msg_detailed_disk_info="gpart(8) show %s:\n%s\n\ncamcontrol(8) inquiry %s:\n%s\n\n\ncamcontrol(8) identify %s:\n%s\n"
-msg_disk_info="Disk Info"
-msg_disk_info_help="Get detailed information on disk device(s)"
-msg_disk_plural="disks"
-msg_disk_singular="disk"
-msg_encrypt_disks="Encrypt Disks?"
-msg_encrypt_disks_help="Use geli(8) to encrypt all data partitions"
-msg_error="Error"
-msg_force_4k_sectors="Force 4K Sectors?"
-msg_force_4k_sectors_help="Align partitions to 4K sector boundries and set vfs.zfs.min_auto_ashift=12"
-msg_freebsd_installer="FreeBSD Installer"
-msg_geli_password="Enter a strong passphrase, used to protect your encryption keys. You will be required to enter this passphrase each time the system is booted"
-msg_geli_setup="Initializing encryption on selected disks,\n this will take several seconds per disk"
-msg_install="Install"
-msg_install_desc="Proceed with Installation"
-msg_install_help="Create ZFS boot pool with displayed options"
-msg_invalid_boot_pool_size="Invalid boot pool size \`%s'"
-msg_invalid_disk_argument="Invalid disk argument \`%s'"
-msg_invalid_index_argument="Invalid index argument \`%s'"
-msg_invalid_pool_size="Invalid pool size \`%s'"
-msg_invalid_swap_size="Invalid swap size \`%s'"
-msg_invalid_virtual_device_type="Invalid Virtual Device type \`%s'"
-msg_last_chance_are_you_sure="Last Chance! Are you sure you want to destroy\nthe current contents of the following disks:\n\n   %s"
-msg_last_chance_are_you_sure_color='\\ZrLast Chance!\\ZR Are you \\Z1sure\\Zn you want to \\Zr\\Z1destroy\\Zn\nthe current contents of the following disks:\n\n   %s'
-msg_mirror_desc="Mirror - n-Way Mirroring"
-msg_mirror_help="[2+ Disks] Mirroring provides the best performance, but the least storage"
-msg_missing_disk_arguments="missing disk arguments"
-msg_missing_one_or_more_scripted_disks="Missing one or more scripted disks!"
-msg_no="NO"
-msg_no_disks_present_to_configure="No disk(s) present to configure"
-msg_no_disks_selected="No disks selected."
-msg_not_enough_disks_selected="Not enough disks selected. (%u < %u minimum)"
-msg_null_disk_argument="NULL disk argument"
-msg_null_index_argument="NULL index argument"
-msg_null_poolname="NULL poolname"
-msg_odd_disk_selected="An even number of disks must be selected to create a RAID 1+0. (%u selected)"
-msg_ok="OK"
-msg_partition_scheme="Partition Scheme"
-msg_partition_scheme_help="Select partitioning scheme. GPT is recommended."
-msg_please_enter_a_name_for_your_zpool="Please enter a name for your zpool:"
-msg_please_enter_amount_of_swap_space="Please enter amount of swap space (SI-Unit suffixes\nrecommended; e.g., \`2g' for 2 Gigabytes):"
-msg_please_select_one_or_more_disks="Please select one or more disks to create a zpool:"
-msg_pool_name="Pool Name"
-msg_pool_name_cannot_be_empty="Pool name cannot be empty."
-msg_pool_name_help="Customize the name of the zpool to be created (Required)"
-msg_pool_type_disks="Pool Type/Disks:"
-msg_pool_type_disks_help="Choose type of ZFS Virtual Device and disks to use (Required)"
-msg_processing_selection="Processing selection..."
-msg_raid10_desc="RAID 1+0 - n x 2-Way Mirrors"
-msg_raid10_help="[4+ Disks] Striped Mirrors provides the best performance, but the least storage"
-msg_raidz1_desc="RAID-Z1 - Single Redundant RAID"
-msg_raidz1_help="[3+ Disks] Withstand failure of 1 disk. Recommended for: 3, 5 or 9 disks"
-msg_raidz2_desc="RAID-Z2 - Double Redundant RAID"
-msg_raidz2_help="[4+ Disks] Withstand failure of 2 disks. Recommended for: 4, 6 or 10 disks"
-msg_raidz3_desc="RAID-Z3 - Triple Redundant RAID"
-msg_raidz3_help="[5+ Disks] Withstand failure of 3 disks. Recommended for: 5, 7 or 11 disks"
-msg_rescan_devices="Rescan Devices"
-msg_rescan_devices_help="Scan for device changes"
-msg_select="Select"
-msg_select_a_disk_device="Select a disk device"
-msg_select_virtual_device_type="Select Virtual Device type:"
-msg_stripe_desc="Stripe - No Redundancy"
-msg_stripe_help="[1+ Disks] Striping provides maximum storage but no redundancy"
-msg_swap_encrypt="Encrypt Swap?"
-msg_swap_encrypt_help="Encrypt swap partitions with temporary keys, discarded on reboot"
-msg_swap_invalid="The selected swap size (%s) is invalid. Enter a number optionally followed by units. Example: 2G"
-msg_swap_mirror="Mirror Swap?"
-msg_swap_mirror_help="Mirror swap partitions for redundancy, breaks crash dumps"
-msg_swap_size="Swap Size"
-msg_swap_size_help="Customize how much swap space is allocated to each selected disk"
-msg_swap_toosmall="The selected swap size (%s) is to small. Please enter a value greater than 100MB or enter 0 for no swap"
-msg_these_disks_are_too_small="These disks are smaller than the amount of requested\nswap (%s) and/or geli(8) (%s) partitions, which would\ntake 100%% or more of each of the following selected disks:\n\n  %s\n\nRecommend changing partition size(s) and/or selecting a\ndifferent set of disks."
-msg_unable_to_get_disk_capacity="Unable to get disk capacity of \`%s'"
-msg_unsupported_partition_scheme="%s is an unsupported partition scheme"
-msg_user_cancelled="User Cancelled."
-msg_yes="YES"
-msg_zfs_configuration="ZFS Configuration"
-
-############################################################ FUNCTIONS
-
-# dialog_menu_main
-#
-# Display the dialog(1)-based application main menu.
-#
-dialog_menu_main()
-{
-	local title="$DIALOG_TITLE"
-	local btitle="$DIALOG_BACKTITLE"
-	local prompt="$msg_configure_options"
-	local force4k="$msg_no"
-	local usegeli="$msg_no"
-	local swapgeli="$msg_no"
-	local swapmirror="$msg_no"
-	[ "$ZFSBOOT_FORCE_4K_SECTORS" ] && force4k="$msg_yes"
-	[ "$ZFSBOOT_GELI_ENCRYPTION" ] && usegeli="$msg_yes"
-	[ "$ZFSBOOT_SWAP_ENCRYPTION" ] && swapgeli="$msg_yes"
-	[ "$ZFSBOOT_SWAP_MIRROR" ] && swapmirror="$msg_yes"
-	local disks n disks_grammar
-	f_count n $ZFSBOOT_DISKS
-	{ [ $n -eq 1 ] && disks_grammar=$msg_disk_singular; } ||
-		disks_grammar=$msg_disk_plural # grammar
-	local menu_list="
-		'>>> $msg_install'      '$msg_install_desc'
-		                        '$msg_install_help'
-		'T $msg_pool_type_disks'
-		               '$ZFSBOOT_VDEV_TYPE: $n $disks_grammar'
-		               '$msg_pool_type_disks_help'
-		'- $msg_rescan_devices' '*'
-		                        '$msg_rescan_devices_help'
-		'- $msg_disk_info'      '*'
-		                        '$msg_disk_info_help'
-		'N $msg_pool_name'      '$ZFSBOOT_POOL_NAME'
-		                        '$msg_pool_name_help'
-		'4 $msg_force_4k_sectors'
-		                        '$force4k'
-		                        '$msg_force_4k_sectors_help'
-		'E $msg_encrypt_disks'  '$usegeli'
-		                        '$msg_encrypt_disks_help'
-		'P $msg_partition_scheme'
-		               '$ZFSBOOT_PARTITION_SCHEME ($ZFSBOOT_BOOT_TYPE)'
-		               '$msg_partition_scheme_help'
-		'S $msg_swap_size'      '$ZFSBOOT_SWAP_SIZE'
-		                        '$msg_swap_size_help'
-		'M $msg_swap_mirror'    '$swapmirror'
-		                        '$msg_swap_mirror_help'
-		'W $msg_swap_encrypt'   '$swapgeli'
-		                        '$msg_swap_encrypt_help'
-	" # END-QUOTE
-	local defaultitem= # Calculated below
-	local hline="$hline_alnum_arrows_punc_tab_enter"
-
-	local height width rows
-	eval f_dialog_menu_with_help_size height width rows \
-		\"\$title\" \"\$btitle\" \"\$prompt\" \"\$hline\" $menu_list
-
-	# Obtain default-item from previously stored selection
-	f_dialog_default_fetch defaultitem
-
-	local menu_choice
-	menu_choice=$( eval $DIALOG \
-		--title \"\$title\"              \
-		--backtitle \"\$btitle\"         \
-		--hline \"\$hline\"              \
-		--item-help                      \
-		--ok-label \"\$msg_select\"      \
-		--cancel-label \"\$msg_cancel\"  \
-		--default-item \"\$defaultitem\" \
-		--menu \"\$prompt\"              \
-		$height $width $rows             \
-		$menu_list                       \
-		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	)
-	local retval=$?
-	f_dialog_data_sanitize menu_choice
-	f_dialog_menutag_store "$menu_choice"
-
-	# Only update default-item on success
-	[ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
-
-	return $retval
-}
-
-# dialog_last_chance $disks ...
-#
-# Display a list of the disks that the user is about to destroy. The default
-# action is to return error status unless the user explicitly (non-default)
-# selects "Yes" from the noyes dialog.
-#
-dialog_last_chance()
-{
-	local title="$DIALOG_TITLE"
-	local btitle="$DIALOG_BACKTITLE"
-	local prompt # Calculated below
-	local hline="$hline_arrows_tab_enter"
-
-	local height=8 width=50 prefix="   "
-	local plen=${#prefix} list= line=
-	local max_width=$(( $width - 3 - $plen ))
-
-	local yes no defaultno extra_args format
-	if [ "$USE_XDIALOG" ]; then
-		yes=ok no=cancel defaultno=default-no
-		extra_args="--wrap --left"
-		format="$msg_last_chance_are_you_sure"
-	else
-		yes=yes no=no defaultno=defaultno
-		extra_args="--colors --cr-wrap"
-		format="$msg_last_chance_are_you_sure_color"
-	fi
-
-	local disk line_width
-	for disk in $*; do
-		if [ "$line" ]; then
-			line_width=${#line}
-		else
-			line_width=$plen
-		fi
-		line_width=$(( $line_width + 1 + ${#disk} ))
-		# Add newline before disk if it would exceed max_width
-		if [ $line_width -gt $max_width ]; then
-			list="$list$line\n"
-			line="$prefix"
-			height=$(( $height + 1 ))
-		fi
-		# Add the disk to the list
-		line="$line $disk"
-	done
-	# Append the left-overs
-	if [ "${line#$prefix}" ]; then
-		list="$list$line"
-		height=$(( $height + 1 ))
-	fi
-
-	# Add height for Xdialog(1)
-	[ "$USE_XDIALOG" ] && height=$(( $height + $height / 5 + 3 ))
-
-	prompt=$( printf "$format" "$list" )
-	f_dprintf "%s: Last Chance!" "$0"
-	$DIALOG \
-		--title "$title"        \
-		--backtitle "$btitle"   \
-		--hline "$hline"        \
-		--$defaultno            \
-		--$yes-label "$msg_yes" \
-		--$no-label "$msg_no"   \
-		$extra_args             \
-		--yesno "$prompt" $height $width
-}
-
-# dialog_menu_layout
-#
-# Configure Virtual Device type and disks to use for the ZFS boot pool. User
-# must select enough disks to satisfy the chosen vdev type.
-#
-dialog_menu_layout()
-{
-	local funcname=dialog_menu_layout
-	local title="$DIALOG_TITLE"
-	local btitle="$DIALOG_BACKTITLE"
-	local vdev_prompt="$msg_select_virtual_device_type"
-	local disk_prompt="$msg_please_select_one_or_more_disks"
-	local vdev_menu_list="
-		'stripe' '$msg_stripe_desc' '$msg_stripe_help'
-		'mirror' '$msg_mirror_desc' '$msg_mirror_help'
-		'raid10' '$msg_raid10_desc' '$msg_raid10_help'
-		'raidz1' '$msg_raidz1_desc' '$msg_raidz1_help'
-		'raidz2' '$msg_raidz2_desc' '$msg_raidz2_help'
-		'raidz3' '$msg_raidz3_desc' '$msg_raidz3_help'
-	" # END-QUOTE
-	local disk_check_list= # Calculated below
-	local vdev_hline="$hline_arrows_tab_enter"
-	local disk_hline="$hline_arrows_space_tab_enter"
-
-	# Warn the user if vdev type is not valid
-	case "$ZFSBOOT_VDEV_TYPE" in
-	stripe|mirror|raid10|raidz1|raidz2|raidz3) : known good ;;
-	*)
-		f_dprintf "%s: Invalid virtual device type \`%s'" \
-			  $funcname "$ZFSBOOT_VDEV_TYPE"
-		f_show_err "$msg_invalid_virtual_device_type" \
-			   "$ZFSBOOT_VDEV_TYPE"
-		f_interactive || return $FAILURE
-	esac
-
-	# Calculate size of vdev menu once only
-	local vheight vwidth vrows
-	eval f_dialog_menu_with_help_size vheight vwidth vrows \
-		\"\$title\" \"\$btitle\" \"\$vdev_prompt\" \"\$vdev_hline\" \
-		$vdev_menu_list
-
-	# Get a list of probed disk devices
-	local disks=
-	debug= f_device_find "" $DEVICE_TYPE_DISK disks
-
-	# Prune out mounted md(4) devices that may be part of the boot process
-	local disk name new_list=
-	for disk in $disks; do
-		debug= $disk get name name
-		case "$name" in
-		md[0-9]*) f_mounted -b "/dev/$name" && continue ;;
-		esac
-		new_list="$new_list $disk"
-	done
-	disks="${new_list# }"
-
-	# Debugging
-	if [ "$debug" ]; then
-		local disk_names=
-		for disk in $disks; do
-			debug= $disk get name name
-			disk_names="$disk_names $name"
-		done
-		f_dprintf "$funcname: disks=[%s]" "${disk_names# }"
-	fi
-
-	if [ ! "$disks" ]; then
-		f_dprintf "No disk(s) present to configure"
-		f_show_err "$msg_no_disks_present_to_configure"
-		return $FAILURE
-	fi
-
-	# Lets sort the disks array to be more user friendly
-	f_device_sort_by name disks disks
-
-	#
-	# Operate in a loop so we can (if interactive) repeat if not enough
-	# disks are selected to satisfy the chosen vdev type or user wants to
-	# back-up to the previous menu.
-	#
-	local vardisk ndisks onoff selections vdev_choice breakout device
-	local valid_disks all_valid want_disks desc height width rows
-	while :; do
-		#
-		# Confirm the vdev type that was selected
-		#
-		if f_interactive && [ "$ZFSBOOT_CONFIRM_LAYOUT" ]; then
-			vdev_choice=$( eval $DIALOG \
-				--title \"\$title\"              \
-				--backtitle \"\$btitle\"         \
-				--hline \"\$vdev_hline\"         \
-				--ok-label \"\$msg_ok\"          \
-				--cancel-label \"\$msg_cancel\"  \
-				--item-help                      \
-				--default-item \"\$ZFSBOOT_VDEV_TYPE\" \
-				--menu \"\$vdev_prompt\"         \
-				$vheight $vwidth $vrows          \
-				$vdev_menu_list                  \
-				2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-			) || return $?
-				# Exit if user pressed ESC or chose Cancel/No
-			f_dialog_data_sanitize vdev_choice
-
-			ZFSBOOT_VDEV_TYPE="$vdev_choice"
-			f_dprintf "$funcname: ZFSBOOT_VDEV_TYPE=[%s]" \
-			          "$ZFSBOOT_VDEV_TYPE"
-		fi
-
-		# Determine the number of disks needed for this vdev type
-		want_disks=0
-		case "$ZFSBOOT_VDEV_TYPE" in
-		stripe) want_disks=1 ;;
-		mirror) want_disks=2 ;;
-		raid10) want_disks=4 ;;
-		raidz1) want_disks=3 ;;
-		raidz2) want_disks=4 ;;
-		raidz3) want_disks=5 ;;
-		esac
-
-		#
-		# Warn the user if any scripted disks are invalid
-		#
-		valid_disks= all_valid=${ZFSBOOT_DISKS:+1} # optimism
-		for disk in $ZFSBOOT_DISKS; do
-			if debug= f_device_find -1 \
-				$disk $DEVICE_TYPE_DISK device
-			then
-				valid_disks="$valid_disks $disk"
-				continue
-			fi
-			f_dprintf "$funcname: \`%s' is not a real disk" "$disk"
-			all_valid=
-		done
-		if [ ! "$all_valid" ]; then
-			if [ "$ZFSBOOT_DISKS" ]; then
-				f_show_err \
-				    "$msg_missing_one_or_more_scripted_disks"
-			else
-				f_dprintf "No disks selected."
-				f_interactive ||
-					f_show_err "$msg_no_disks_selected"
-			fi
-			f_interactive || return $FAILURE
-		fi
-		ZFSBOOT_DISKS="${valid_disks# }"
-
-		#
-		# Short-circuit if we're running non-interactively
-		#
-		if ! f_interactive || [ ! "$ZFSBOOT_CONFIRM_LAYOUT" ]; then
-			f_count ndisks $ZFSBOOT_DISKS
-			[ $ndisks -ge $want_disks ] && break # to success
-
-			# Not enough disks selected
-			f_dprintf "$funcname: %s: %s (%u < %u minimum)" \
-				  "$ZFSBOOT_VDEV_TYPE" \
-				  "Not enough disks selected." \
-				  $ndisks $want_disks
-			f_interactive || return $FAILURE
-			msg_yes="$msg_change_selection" msg_no="$msg_cancel" \
-				f_yesno "%s: $msg_not_enough_disks_selected" \
-				"$ZFSBOOT_VDEV_TYPE" $ndisks $want_disks ||
-				return $FAILURE
-		fi
-
-		#
-		# Confirm the disks that were selected
-		# Loop until the user cancels or selects enough disks
-		#
-		breakout=
-		while :; do
-			# Loop over list of available disks, resetting state
-			for disk in $disks; do
-				f_isset _${disk}_status && _${disk}_status=
-			done
-
-			# Loop over list of selected disks and create temporary
-			# locals to map statuses onto up-to-date list of disks
-			for disk in $ZFSBOOT_DISKS; do
-				debug= f_device_find -1 \
-					$disk $DEVICE_TYPE_DISK disk
-				f_isset _${disk}_status ||
-					local _${disk}_status
-				_${disk}_status=on
-			done
-
-			# Create the checklist menu of discovered disk devices
-			disk_check_list=
-			for disk in $disks; do
-				desc=
-				$disk get name name
-				$disk get desc desc
-				f_shell_escape "$desc" desc
-				f_getvar _${disk}_status:-off onoff
-				disk_check_list="$disk_check_list
-					$name '$desc' $onoff"
-			done
-
-			eval f_dialog_checklist_size height width rows \
-				\"\$title\" \"\$btitle\" \"\$prompt\" \
-				\"\$hline\" $disk_check_list
-
-			selections=$( eval $DIALOG \
-				--title \"\$DIALOG_TITLE\"         \
-				--backtitle \"\$DIALOG_BACKTITLE\" \
-				--separate-output                  \
-				--hline \"\$hline\"                \
-				--ok-label \"\$msg_ok\"            \
-				--cancel-label \"\$msg_back\"      \
-				--checklist \"\$prompt\"           \
-				$height $width $rows               \
-				$disk_check_list                   \
-				2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-			) || break
-				# Loop if user pressed ESC or chose Cancel/No
-			f_dialog_data_sanitize selections
-
-			ZFSBOOT_DISKS="$selections"
-			f_dprintf "$funcname: ZFSBOOT_DISKS=[%s]" \
-			          "$ZFSBOOT_DISKS"
-
-			f_count ndisks $ZFSBOOT_DISKS
-
-			if [ "$ZFSBOOT_VDEV_TYPE" == "raid10" ] &&
-			    [ $(( $ndisks % 2 )) -ne 0 ]; then
-				f_dprintf "$funcname: %s: %s (%u %% 2 = %u)" \
-					  "$ZFSBOOT_VDEV_TYPE" \
-					  "Number of disks not even:" \
-					  $ndisks $(( $ndisks % 2 ))
-				msg_yes="$msg_change_selection" \
-					msg_no="$msg_cancel" \
-					f_yesno "%s: $msg_odd_disk_selected" \
-						"$ZFSBOOT_VDEV_TYPE" $ndisks ||
-						break
-				continue
-			fi
-
-			[ $ndisks -ge $want_disks ] &&
-				breakout=break && break
-
-			# Not enough disks selected
-			f_dprintf "$funcname: %s: %s (%u < %u minimum)" \
-				  "$ZFSBOOT_VDEV_TYPE" \
-			          "Not enough disks selected." \
-			          $ndisks $want_disks
-			msg_yes="$msg_change_selection" msg_no="$msg_cancel" \
-				f_yesno "%s: $msg_not_enough_disks_selected" \
-				"$ZFSBOOT_VDEV_TYPE" $ndisks $want_disks ||
-				break
-		done
-		[ "$breakout" = "break" ] && break
-		[ "$ZFSBOOT_CONFIRM_LAYOUT" ] || return $FAILURE
-	done
-
-	return $DIALOG_OK
-}
-
-# zfs_create_diskpart $disk $index
-#
-# For each block device to be used in the zpool, rather than just create the
-# zpool with the raw block devices (e.g., da0, da1, etc.) we create partitions
-# so we can have some real swap. This also provides wiggle room incase your
-# replacement drivers do not have the exact same sector counts.
-#
-# NOTE: $swapsize and $bootsize should be defined by the calling function.
-# NOTE: Sets $bootpart and $targetpart for the calling function.
-#
-zfs_create_diskpart()
-{
-	local funcname=zfs_create_diskpart
-	local disk="$1" index="$2"
-
-	# Check arguments
-	if [ ! "$disk" ]; then
-		f_dprintf "$funcname: NULL disk argument"
-		msg_error="$msg_error: $funcname" \
-			f_show_err "$msg_null_disk_argument"
-		return $FAILURE
-	fi
-	if [ "${disk#*[$IFS]}" != "$disk" ]; then
-		f_dprintf "$funcname: Invalid disk argument \`%s'" "$disk"
-		msg_error="$msg_error: $funcname" \
-			f_show_err "$msg_invalid_disk_argument" "$disk"
-		return $FAILURE
-	fi
-	if [ ! "$index" ]; then
-		f_dprintf "$funcname: NULL index argument"
-		msg_error="$msg_error: $funcname" \
-			f_show_err "$msg_null_index_argument"
-		return $FAILURE
-	fi
-	if ! f_isinteger "$index"; then
-		f_dprintf "$funcname: Invalid index argument \`%s'" "$index"
-		msg_error="$msg_error: $funcname" \
-			f_show_err "$msg_invalid_index_argument" "$index"
-		return $FAILURE
-	fi
-	f_dprintf "$funcname: disk=[%s] index=[%s]" "$disk" "$index"
-
-	# Check for unknown partition scheme before proceeding further
-	case "$ZFSBOOT_PARTITION_SCHEME" in
-	""|MBR|GPT*) : known good ;;
-	*)
-		f_dprintf "$funcname: %s is an unsupported partition scheme" \
-		          "$ZFSBOOT_PARTITION_SCHEME"
-		msg_error="$msg_error: $funcname" f_show_err \
-			"$msg_unsupported_partition_scheme" \
-			"$ZFSBOOT_PARTITION_SCHEME"
-		return $FAILURE
-	esac
-
-	#
-	# Destroy whatever partition layout is currently on disk.
-	# NOTE: `-F' required to destroy if partitions still exist.
-	# NOTE: Failure is ok here, blank disk will have nothing to destroy.
-	#
-	f_dprintf "$funcname: Exporting ZFS pools..."
-	zpool list -Ho name | while read z_name; do
-		f_eval_catch -d $funcname zpool "$ZPOOL_EXPORT_F" $z_name
-	done
-	f_dprintf "$funcname: Detaching all GELI providers..."
-	geli status | tail -n +2 | while read g_name g_status g_component; do
-		f_eval_catch -d $funcname geli "$GELI_DETACH_F" $g_name
-	done
-	f_dprintf "$funcname: Destroying all data/layouts on \`%s'..." "$disk"
-	f_eval_catch -d $funcname gpart "$GPART_DESTROY_F" $disk
-	f_eval_catch -d $funcname graid "$GRAID_DELETE" $disk
-	f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" /dev/$disk
-
-	# Make doubly-sure backup GPT is destroyed
-	f_eval_catch -d $funcname gpart "$GPART_CREATE" gpt $disk
-	f_eval_catch -d $funcname gpart "$GPART_DESTROY_F" $disk
-
-	#
-	# Lay down the desired type of partition scheme
-	#
-	local setsize mbrindex align_small align_big
-	#
-	# If user has requested 4 K alignment, add these params to the
-	# gpart add calls. With GPT, we align large partitions to 1 M for
-	# improved performance on SSDs. MBR does not always play well with gaps
-	# between partitions, so all alignment is only 4k for that case.
-	# With MBR, we align the BSD partition that contains the MBR, otherwise
-	# the system fails to boot.
-	#
-	if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
-		align_small="-a 4k"
-		align_big="-a 1m"
-	fi
-
-	case "$ZFSBOOT_PARTITION_SCHEME" in
-	""|GPT*) f_dprintf "$funcname: Creating GPT layout..."
-		#
-		# 1. Create GPT layout using labels
-		#
-		f_eval_catch $funcname gpart "$GPART_CREATE" gpt $disk ||
-		             return $FAILURE
-
-		#
-		# Apply workarounds if requested by the user
-		#
-		if [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT + Lenovo Fix" ]; then
-			f_eval_catch $funcname gpart "$GPART_SET_LENOVOFIX" \
-			             $disk || return $FAILURE
-		elif [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT + Active" ]; then
-			f_eval_catch $funcname gpart "$GPART_SET_PMBR_ACTIVE" \
-			             $disk || return $FAILURE
-		fi
-
-		#
-		# 2. Add small freebsd-boot and/or efi partition
-		#
-		if [ "$ZFSBOOT_BOOT_TYPE" = "UEFI" -o \
-		     "$ZFSBOOT_BOOT_TYPE" = "BIOS+UEFI" ]
-		then
-			f_eval_catch -k justaddedpart $funcname gpart \
-			             "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
-			             "$align_small" efiboot$index efi 260M \
-			             $disk || return $FAILURE
-
-			# We'll configure the ESP in bootconfig
-			if [ -z "$efibootpart" ]; then
-				efibootpart="/dev/$(echo $justaddedpart | cut -f 1 -d ' ')"
-				f_dprintf "$funcname: configuring ESP at [%s]" \
-				          "${efibootpart}"
-
-				f_eval_catch $funcname newfs_msdos "$NEWFS_ESP"\
-				             "$efibootpart" \
-				             || return $FAILURE
-				f_eval_catch $funcname printf "$PRINTF_FSTAB" \
-					     $efibootpart /boot/efi msdosfs \
-				             rw 2 2 "$BSDINSTALL_TMPETC/fstab" \
-				             || return $FAILURE
-			fi
-		fi
-
-		if [ "$ZFSBOOT_BOOT_TYPE" = "BIOS" -o \
-		     "$ZFSBOOT_BOOT_TYPE" = "BIOS+UEFI" ]
-		then
-			f_eval_catch $funcname gpart \
-			             "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
-			             "$align_small" gptboot$index \
-			             freebsd-boot 512k $disk || return $FAILURE
-			if [ "$ZFSBOOT_BOOT_TYPE" = "BIOS" ]; then
-				f_eval_catch $funcname gpart \
-				             "$GPART_BOOTCODE_PART" \
-				             /boot/pmbr /boot/gptzfsboot 1 \
-				             $disk || return $FAILURE
-			else
-				f_eval_catch $funcname gpart \
-				             "$GPART_BOOTCODE_PART" \
-				             /boot/pmbr /boot/gptzfsboot 2 \
-				             $disk || return $FAILURE
-			fi
-		fi
-
-		# NB: zpool will use the `zfs#' GPT labels
-		if [ "$ZFSBOOT_BOOT_TYPE" = "BIOS+UEFI" ]; then
-			if [ "$ZFSBOOT_BOOT_POOL" ]; then
-				bootpart=p3 swappart=p4 targetpart=p4
-				[ ${swapsize:-0} -gt 0 ] && targetpart=p5
-			else
-				# Bootpart unused
-				bootpart=p3 swappart=p3 targetpart=p3
-				[ ${swapsize:-0} -gt 0 ] && targetpart=p4
-			fi
-		else
-			if [ "$ZFSBOOT_BOOT_POOL" ]; then
-				bootpart=p2 swappart=p3 targetpart=p3
-				[ ${swapsize:-0} -gt 0 ] && targetpart=p4
-			else
-				# Bootpart unused
-				bootpart=p2 swappart=p2 targetpart=p2
-				[ ${swapsize:-0} -gt 0 ] && targetpart=p3
-			fi
-		fi
-
-		#
-		# Prepare boot pool if enabled (e.g., for geli(8))
-		#
-		if [ "$ZFSBOOT_BOOT_POOL" ]; then
-			f_eval_catch $funcname gpart \
-			             "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
-			             "$align_big" boot$index freebsd-zfs \
-			             ${bootsize}b $disk || return $FAILURE
-			# Pedantically nuke any old labels
-			f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
-			                /dev/$disk$bootpart
-			if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
-				# Pedantically detach targetpart for later
-				f_eval_catch -d $funcname geli \
-				                "$GELI_DETACH_F" \
-				                /dev/$disk$targetpart
-			fi
-		fi
-
-		#
-		# 3. Add freebsd-swap partition labeled `swap#'
-		#
-		if [ ${swapsize:-0} -gt 0 ]; then
-			f_eval_catch $funcname gpart \
-			             "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
-			             "$align_big" swap$index freebsd-swap \
-			             ${swapsize}b $disk || return $FAILURE
-			# Pedantically nuke any old labels on the swap
-			f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
-			                /dev/$disk$swappart
-		fi
-
-		#
-		# 4. Add freebsd-zfs partition labeled `zfs#' for zroot
-		#
-		if [ "$ZFSBOOT_POOL_SIZE" ]; then
-			f_eval_catch $funcname gpart "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
-					"$align_big" zfs$index freebsd-zfs $ZFSBOOT_POOL_SIZE $disk ||
-					return $FAILURE
-		else
-			f_eval_catch $funcname gpart "$GPART_ADD_ALIGN_LABEL" \
-					"$align_big" zfs$index freebsd-zfs $disk ||
-					return $FAILURE
-		fi
-		f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
-		                /dev/$disk$targetpart
-		;;
-
-	MBR) f_dprintf "$funcname: Creating MBR layout..."
-		#
-		# Enable boot pool if encryption is desired
-		#
-		[ "$ZFSBOOT_GELI_ENCRYPTION" ] && ZFSBOOT_BOOT_POOL=1
-		#
-		# 1. Create MBR layout (no labels)
-		#
-		f_eval_catch $funcname gpart "$GPART_CREATE" mbr $disk ||
-		             return $FAILURE
-		f_eval_catch $funcname gpart "$GPART_BOOTCODE" /boot/mbr \
-		             $disk || return $FAILURE
-
-		#
-		# 2. Add freebsd slice with all available space
-		#
-		f_eval_catch $funcname gpart "$GPART_ADD_ALIGN" \
-		             "$align_small" freebsd $disk || return $FAILURE
-		f_eval_catch $funcname gpart "$GPART_SET_ACTIVE" 1 $disk ||
-		             return $FAILURE
-		# Pedantically nuke any old labels
-		f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
-		                /dev/${disk}s1
-		# Pedantically nuke any old scheme
-		f_eval_catch -d $funcname gpart "$GPART_DESTROY_F" ${disk}s1
-
-		#
-		# 3. Write BSD scheme to the freebsd slice
-		#
-		f_eval_catch $funcname gpart "$GPART_CREATE" BSD ${disk}s1 ||
-		             return $FAILURE
-
-		# NB: zpool will use s1a (no labels)
-		bootpart=s1a swappart=s1b targetpart=s1d mbrindex=4
-
-		#
-		# Always prepare a boot pool on MBR
-		# Do not align this partition, there must not be a gap
-		#
-		ZFSBOOT_BOOT_POOL=1
-		f_eval_catch $funcname gpart \
-		             "$GPART_ADD_ALIGN_INDEX_WITH_SIZE" \
-		             "" 1 freebsd-zfs ${bootsize}b ${disk}s1 ||
-		             return $FAILURE
-		# Pedantically nuke any old labels
-		f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
-		                /dev/$disk$bootpart
-		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
-			# Pedantically detach targetpart for later
-			f_eval_catch -d $funcname geli \
-			                "$GELI_DETACH_F" \
-					/dev/$disk$targetpart
-		fi
-
-		#
-		# 4. Add freebsd-swap partition
-		#
-		if [ ${swapsize:-0} -gt 0 ]; then
-			f_eval_catch $funcname gpart \
-			             "$GPART_ADD_ALIGN_INDEX_WITH_SIZE" \
-			             "$align_small" 2 freebsd-swap \
-			             ${swapsize}b ${disk}s1 || return $FAILURE
-			# Pedantically nuke any old labels on the swap
-			f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
-			                /dev/${disk}s1b
-		fi
-
-		#
-		# 5. Add freebsd-zfs partition for zroot
-		#
-		if [ "$ZFSBOOT_POOL_SIZE" ]; then
-			f_eval_catch $funcname gpart "$GPART_ADD_ALIGN_INDEX_WITH_SIZE" \
-					"$align_small" $mbrindex freebsd-zfs $ZFSBOOT_POOL_SIZE ${disk}s1 || return $FAILURE
-		else
-			f_eval_catch $funcname gpart "$GPART_ADD_ALIGN_INDEX" \
-					"$align_small" $mbrindex freebsd-zfs ${disk}s1 || return $FAILURE
-		fi
-		f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
-		                /dev/$disk$targetpart # Pedantic
-		f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \
-		             /boot/zfsboot /dev/${disk}s1 count=1 ||
-		             return $FAILURE
-		;;
-
-	esac # $ZFSBOOT_PARTITION_SCHEME
-
-	# Update fstab(5)
-	local swapsize
-	f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize
-	if [ "$isswapmirror" ]; then
-		# This is not the first disk in the mirror, do nothing
-	elif [ ${swapsize:-0} -eq 0 ]; then
-		# If swap is 0 sized, don't add it to fstab
-	elif [ "$ZFSBOOT_SWAP_ENCRYPTION" -a "$ZFSBOOT_SWAP_MIRROR" ]; then
-		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
-		             /dev/mirror/swap.eli none swap sw 0 0 \
-		             $BSDINSTALL_TMPETC/fstab || return $FAILURE
-		isswapmirror=1
-	elif [ "$ZFSBOOT_SWAP_MIRROR" ]; then
-		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
-		             /dev/mirror/swap none swap sw 0 0 \
-		             $BSDINSTALL_TMPETC/fstab || return $FAILURE
-		isswapmirror=1
-	elif [ "$ZFSBOOT_SWAP_ENCRYPTION" ]; then
-		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
-		             /dev/$disk${swappart}.eli none swap sw 0 0 \
-		             $BSDINSTALL_TMPETC/fstab || return $FAILURE
-	else
-		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
-		             /dev/$disk$swappart none swap sw 0 0 \
-		             $BSDINSTALL_TMPETC/fstab || return $FAILURE
-	fi
-
-	return $SUCCESS
-}
-
-# zfs_create_boot $poolname $vdev_type $disks ...
-#
-# Creates boot pool and dataset layout. Returns error if something goes wrong.
-# Errors are printed to stderr for collection and display.
-#
-zfs_create_boot()
-{
-	local funcname=zfs_create_boot
-	local zroot_name="$1"
-	local zroot_vdevtype="$2"
-	local zroot_vdevs= # Calculated below
-	local swap_devs= # Calculated below
-	local boot_vdevs= # Used for geli(8) and/or MBR layouts
-	shift 2 # poolname vdev_type
-	local disks="$*" disk
-	local isswapmirror
-	local bootpart targetpart swappart # Set by zfs_create_diskpart() below
-	local create_options
-	local efibootpart
-
-	#
-	# Pedantic checks; should never be seen
-	#
-	if [ ! "$zroot_name" ]; then
-		f_dprintf "$funcname: NULL poolname"
-		msg_error="$msg_error: $funcname" \
-			f_show_err "$msg_null_poolname"
-		return $FAILURE
-	fi
-	if [ $# -lt 1 ]; then
-		f_dprintf "$funcname: missing disk arguments"
-		msg_error="$msg_error: $funcname" \
-			f_show_err "$msg_missing_disk_arguments"
-		return $FAILURE
-	fi
-	f_dprintf "$funcname: poolname=[%s] vdev_type=[%s]" \
-	          "$zroot_name" "$zroot_vdevtype"
-
-	#
-	# Initialize fstab(5)
-	#
-	f_dprintf "$funcname: Initializing temporary fstab(5) file..."
-	f_eval_catch $funcname sh "$SHELL_TRUNCATE" $BSDINSTALL_TMPETC/fstab ||
-	             return $FAILURE
-	f_eval_catch $funcname printf "$PRINTF_FSTAB" \
-	             "# Device" Mountpoint FStype Options Dump "Pass#" \
-	             $BSDINSTALL_TMPETC/fstab || return $FAILURE
-
-	#
-	# Expand SI units in desired sizes
-	#
-	f_dprintf "$funcname: Expanding supplied size values..."
-	local swapsize bootsize poolsize
-	if ! f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize; then
-		f_dprintf "$funcname: Invalid swap size \`%s'" \
-		          "$ZFSBOOT_SWAP_SIZE"
-		f_show_err "$msg_invalid_swap_size" "$ZFSBOOT_SWAP_SIZE"
-		return $FAILURE
-	fi
-	if ! f_expand_number "$ZFSBOOT_BOOT_POOL_SIZE" bootsize; then
-		f_dprintf "$funcname: Invalid boot pool size \`%s'" \
-		          "$ZFSBOOT_BOOT_POOL_SIZE"
-		f_show_err "$msg_invalid_boot_pool_size" \
-		           "$ZFSBOOT_BOOT_POOL_SIZE"
-		return $FAILURE
-	fi
-	if [ "$ZFSBOOT_POOL_SIZE" ]; then
-		if ! f_expand_number "$ZFSBOOT_POOL_SIZE" poolsize; then
-			f_dprintf "$funcname: Invalid pool size \`%s'" \
-				  "$ZFSBOOT_POOL_SIZE"
-			f_show_err "$msg_invalid_pool_size" \
-				   "$ZFSBOOT_POOL_SIZE"
-		fi
-		f_dprintf "$funcname: ZFSBOOT_POOL_SIZE=[%s] poolsize=[%s]" \
-			  "$ZFSBOOT_POOL_SIZE" "$poolsize"
-	fi
-	f_dprintf "$funcname: ZFSBOOT_SWAP_SIZE=[%s] swapsize=[%s]" \
-	          "$ZFSBOOT_SWAP_SIZE" "$swapsize"
-	f_dprintf "$funcname: ZFSBOOT_BOOT_POOL_SIZE=[%s] bootsize=[%s]" \
-	          "$ZFSBOOT_BOOT_POOL_SIZE" "$bootsize"
-
-	#
-	# Destroy the pool in-case this is our second time 'round (case of
-	# failure and installer presented ``Retry'' option to come back).
-	#
-	# NB: If we don't destroy the pool, later gpart(8) destroy commands
-	# that try to clear existing partitions (see zfs_create_diskpart())
-	# will fail with a `Device Busy' error, leading to `GEOM exists'.
-	#
-	f_eval_catch -d $funcname zpool "$ZPOOL_DESTROY" "$zroot_name"
-
-	#
-	# Prepare the disks and build pool device list(s)
-	#
-	f_dprintf "$funcname: Preparing disk partitions for ZFS pool..."
-
-	# Force 4K sectors using vfs.zfs.min_auto_ashift=12
-	if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
-		f_dprintf "$funcname: With 4K sectors..."
-		f_eval_catch $funcname sysctl "$SYSCTL_ZFS_MIN_ASHIFT_12" \
-		    || return $FAILURE
-		sysctl kern.geom.part.mbr.enforce_chs=0
-	fi
-	local n=0
-	for disk in $disks; do
-		zfs_create_diskpart $disk $n || return $FAILURE
-		# Now $bootpart, $targetpart, and $swappart are set (suffix
-		# for $disk)
-		if [ "$ZFSBOOT_BOOT_POOL" ]; then
-			boot_vdevs="$boot_vdevs $disk$bootpart"
-		fi
-		zroot_vdevs="$zroot_vdevs $disk$targetpart"
-		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
-			zroot_vdevs="$zroot_vdevs.eli"
-		fi
-
-		n=$(( $n + 1 ))
-	done # disks
-
-	#
-	# If we need/want a boot pool, create it
-	#
-	if [ "$ZFSBOOT_BOOT_POOL" ]; then
-		local bootpool_vdevtype= # Calculated below
-		local bootpool_options= # Calculated below
-		local bootpool_name="$ZFSBOOT_BOOT_POOL_NAME"
-		local bootpool="$BSDINSTALL_CHROOT/$bootpool_name"
-		local zroot_key="${ZFSBOOT_GELI_KEY_FILE#/}"
-
-		f_dprintf "$funcname: Setting up boot pool..."
-		[ "$ZFSBOOT_GELI_ENCRYPTION" ] &&
-			f_dprintf "$funcname: For encrypted root disk..."
-
-		# Create parent directory for boot pool
-		f_eval_catch -d $funcname umount "$UMOUNT" "$BSDINSTALL_CHROOT"
-		f_eval_catch $funcname mount "$MOUNT_TYPE" tmpfs none \
-		             $BSDINSTALL_CHROOT || return $FAILURE
-
-		# Create mirror across the boot partition on all disks
-		local nvdevs
-		f_count nvdevs $boot_vdevs
-		[ $nvdevs -gt 1 ] && bootpool_vdevtype=mirror
-
-		create_options="$ZFSBOOT_BOOT_POOL_CREATE_OPTIONS"
-		bootpool_options="-o altroot=$BSDINSTALL_CHROOT"
-		bootpool_options="$bootpool_options $create_options"
-		bootpool_options="$bootpool_options -m \"/$bootpool_name\" -f"
-		f_eval_catch $funcname zpool "$ZPOOL_CREATE_WITH_OPTIONS" \
-		             "$bootpool_options" "$bootpool_name" \
-		             "$bootpool_vdevtype" "$boot_vdevs" ||
-		             return $FAILURE
-
-		f_eval_catch $funcname mkdir "$MKDIR_P" "$bootpool/boot" ||
-		             return $FAILURE
-
-		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
-			# Generate an encryption key using random(4)
-			f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \
-			             /dev/random "$bootpool/$zroot_key" \
-			             "bs=4096 count=1" || return $FAILURE
-			f_eval_catch $funcname chmod "$CHMOD_MODE" \
-			             go-wrx "$bootpool/$zroot_key" ||
-			             return $FAILURE
-		fi
-
-	fi
-
-	#
-	# Create the geli(8) GEOMS
-	#
-	if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
-		#
-		# Load the AES-NI kernel module to accelerate encryption
-		#
-		f_eval_catch -d $funcname kldload "$KLDLOAD" "aesni"
-		# Prompt user for password (twice)
-		if ! msg_enter_new_password="$msg_geli_password" \
-			f_dialog_input_password
-		then
-			f_dprintf "$funcname: User cancelled"
-			f_show_err "$msg_user_cancelled"
-			return $FAILURE
-		fi
-
-		# Initialize geli(8) on each of the target partitions
-		for disk in $disks; do
-			f_dialog_info "$msg_geli_setup" \
-				2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-			if [ "$ZFSBOOT_BOOT_POOL" ]; then
-				if ! echo "$pw_password" | f_eval_catch \
-					$funcname geli "$GELI_PASSWORD_INIT" \
-					"$bootpool/boot/$disk$targetpart.eli" \
-					AES-XTS "$bootpool/$zroot_key" \
-					$disk$targetpart
-				then
-					f_interactive || f_die
-					unset pw_password # Sensitive info
-					return $FAILURE
-				fi
-				if ! echo "$pw_password" | f_eval_catch \
-					$funcname geli "$GELI_ATTACH" \
-					"$bootpool/$zroot_key" $disk$targetpart
-				then
-					f_interactive || f_die
-					unset pw_password # Sensitive info
-					return $FAILURE
-				fi
-			else
-				# With no bootpool, there is no place to store
-				# the key files, use only a password
-				if ! echo "$pw_password" | f_eval_catch \
-					$funcname geli \
-					"$GELI_PASSWORD_GELIBOOT_INIT" \
-					AES-XTS $disk$targetpart
-				then
-					f_interactive || f_die
-					unset pw_password # Sensitive info
-					return $FAILURE
-				fi
-				if ! echo "$pw_password" | f_eval_catch \
-					$funcname geli "$GELI_ATTACH_NOKEY" \
-					$disk$targetpart
-				then
-					f_interactive || f_die
-					unset pw_password # Sensitive info
-					return $FAILURE
-				fi
-			fi
-		done
-		unset pw_password # Sensitive info
-	fi
-
-	if [ "$ZFSBOOT_BOOT_POOL" ]; then
-		# Clean up
-		f_eval_catch $funcname zfs "$ZFS_UNMOUNT" "$bootpool_name" ||
-			return $FAILURE
-		# tmpfs
-		f_eval_catch -d $funcname umount "$UMOUNT" "$BSDINSTALL_CHROOT"
-	fi
-
-	#
-	# Create the gmirror(8) GEOMS for swap
-	#
-	if [ ${swapsize:-0} -gt 0 -a "$ZFSBOOT_SWAP_MIRROR" ]; then
-		for disk in $disks; do
-			swap_devs="$swap_devs $disk$swappart"
-		done
-		f_eval_catch $funcname gmirror "$SWAP_GMIRROR_LABEL" \
-			"$swap_devs" || return $FAILURE
-	fi
-
-	#
-	# Create the ZFS root pool with desired type and disk devices
-	#
-	f_dprintf "$funcname: Creating root pool..."
-	create_options="$ZFSBOOT_POOL_CREATE_OPTIONS"
-	if [ "$zroot_vdevtype" == "raid10" ]; then
-		raid10_vdevs=""
-		for vdev in $zroot_vdevs; do
-			f_count nvdev $raid10_vdevs
-			if [ $(( $nvdev % 3 )) -eq 0 ]; then
-				raid10_vdevs="$raid10_vdevs mirror"
-			fi
-			raid10_vdevs="$raid10_vdevs $vdev"
-		done
-		f_eval_catch $funcname zpool "$ZPOOL_CREATE_WITH_OPTIONS" \
-			"-o altroot=$BSDINSTALL_CHROOT $create_options -m none -f" \
-			"$zroot_name" "" "$raid10_vdevs" || return $FAILURE
-	else
-		f_eval_catch $funcname zpool "$ZPOOL_CREATE_WITH_OPTIONS" \
-			"-o altroot=$BSDINSTALL_CHROOT $create_options -m none -f" \
-			"$zroot_name" "$zroot_vdevtype" "$zroot_vdevs" ||
-			return $FAILURE
-	fi
-
-	#
-	# Create ZFS dataset layout within the new root pool
-	#
-	f_dprintf "$funcname: Creating ZFS datasets..."
-	echo "$ZFSBOOT_DATASETS" | while read dataset options; do
-		# Skip blank lines and comments
-		case "$dataset" in "#"*|"") continue; esac
-		# Remove potential inline comments in options
-		options="${options%%#*}"
-		# Replace tabs with spaces
-		f_replaceall "$options" "	" " " options
-		# Reduce contiguous runs of space to one single space
-		oldoptions=
-		while [ "$oldoptions" != "$options" ]; do
-			oldoptions="$options"
-			f_replaceall "$options" "  " " " options
-		done
-		# Replace both commas and spaces with ` -o '
-		f_replaceall "$options" "[ ,]" " -o " options
-		# Create the dataset with desired options
-		f_eval_catch $funcname zfs "$ZFS_CREATE_WITH_OPTIONS" \
-		             "${options:+-o $options}" "$zroot_name$dataset" ||
-		             return $FAILURE
-	done
-
-	#
-	# Set a mountpoint for the root of the pool so newly created datasets
-	# have a mountpoint to inherit
-	#
-	f_dprintf "$funcname: Setting mountpoint for root of the pool..."
-	f_eval_catch $funcname zfs "$ZFS_SET" \
-		"mountpoint=/$zroot_name" "$zroot_name" || return $FAILURE
-
-	# Touch up permissions on the tmp directories
-	f_dprintf "$funcname: Modifying directory permissions..."
-	local dir
-	for dir in /tmp /var/tmp; do
-		f_eval_catch $funcname mkdir "$MKDIR_P" \
-		             $BSDINSTALL_CHROOT$dir || return $FAILURE
-		f_eval_catch $funcname chmod "$CHMOD_MODE" 1777 \
-		             $BSDINSTALL_CHROOT$dir || return $FAILURE
-	done
-
-	# Set bootfs property
-	local zroot_bootfs="$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"
-	f_dprintf "$funcname: Setting bootfs property..."
-	f_eval_catch $funcname zpool "$ZPOOL_SET" \
-		"bootfs=\"$zroot_name/$zroot_bootfs\"" "$zroot_name" ||
-		return $FAILURE
-
-	# MBR boot loader touch-up
-	if [ "$ZFSBOOT_PARTITION_SCHEME" = "MBR" ]; then
-		# Export the pool(s)
-		f_dprintf "$funcname: Temporarily exporting ZFS pool(s)..."
-		f_eval_catch $funcname zpool "$ZPOOL_EXPORT" "$zroot_name" ||
-			     return $FAILURE
-		if [ "$ZFSBOOT_BOOT_POOL" ]; then
-			f_eval_catch $funcname zpool "$ZPOOL_EXPORT" \
-				     "$bootpool_name" || return $FAILURE
-		fi
-
-		f_dprintf "$funcname: Updating MBR boot loader on disks..."
-		# Stick the ZFS boot loader in the "convenient hole" after
-		# the ZFS internal metadata
-		for disk in $disks; do
-			f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \
-			             /boot/zfsboot /dev/$disk$bootpart \
-			             "skip=1 seek=1024" || return $FAILURE
-		done
-
-		# Re-import the ZFS pool(s)
-		f_dprintf "$funcname: Re-importing ZFS pool(s)..."
-		f_eval_catch $funcname zpool "$ZPOOL_IMPORT_WITH_OPTIONS" \
-			     "-o altroot=\"$BSDINSTALL_CHROOT\"" \
-			     "$zroot_name" || return $FAILURE
-		if [ "$ZFSBOOT_BOOT_POOL" ]; then
-			# Import the bootpool, but do not mount it yet
-			f_eval_catch $funcname zpool \
-				     "$ZPOOL_IMPORT_WITH_OPTIONS" \
-				     "-o altroot=\"$BSDINSTALL_CHROOT\" -N" \
-				     "$bootpool_name" || return $FAILURE
-		fi
-	fi
-
-	# Remount bootpool and create symlink(s)
-	if [ "$ZFSBOOT_BOOT_POOL" ]; then
-		f_eval_catch $funcname zfs "$ZFS_MOUNT" "$bootpool_name" ||
-			return $FAILURE
-		f_dprintf "$funcname: Creating /boot symlink for boot pool..."
-		f_eval_catch $funcname ln "$LN_SF" "$bootpool_name/boot" \
-		             $BSDINSTALL_CHROOT/boot || return $FAILURE
-	fi
-
-	# zpool.cache is required to mount more than one pool at boot time
-	f_dprintf "$funcname: Configuring zpool.cache for zroot..."
-	f_eval_catch $funcname mkdir "$MKDIR_P" $BSDINSTALL_CHROOT/boot/zfs ||
-	             return $FAILURE
-	f_eval_catch $funcname zpool "$ZPOOL_SET" \
-	             "cachefile=\"$BSDINSTALL_CHROOT/boot/zfs/zpool.cache\"" \
-	             "$zroot_name" || return $FAILURE
-
-	if [ "$ZFSBOOT_BOOT_POOL" ]; then
-		f_eval_catch $funcname printf "$PRINTF_CONF" \
-			vfs.root.mountfrom \
-			"\"zfs:$zroot_name/$zroot_bootfs\"" \
-			$BSDINSTALL_TMPBOOT/loader.conf.root || return $FAILURE
-	fi
-	#
-	# Set canmount=noauto so that the default Boot Environment (BE) does
-	# not get mounted if a different BE is selected from the beastie menu
-	#
-	f_dprintf "$funcname: Set canmount=noauto for the root of the pool..."
-	f_eval_catch $funcname zfs "$ZFS_SET" "canmount=noauto" \
-		"$zroot_name/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"
-
-	# Last, but not least... required lines for rc.conf(5)/loader.conf(5)
-	# NOTE: We later concatenate these into their destination
-	f_dprintf "%s: Configuring rc.conf(5)/loader.conf(5) additions..." \
-	          "$funcname"
-	f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_enable=\"YES\"' \
-	             $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
-	f_eval_catch $funcname echo "$ECHO_APPEND" \
-	             'kern.geom.label.disk_ident.enable=\"0\"' \
-	             $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
-	f_eval_catch $funcname echo "$ECHO_APPEND" \
-	             '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_TMPETC/sysctl.conf.zfs || return $FAILURE
-	fi
-
-	if [ "$ZFSBOOT_SWAP_MIRROR" ]; then
-		f_eval_catch $funcname echo "$ECHO_APPEND" \
-		             'geom_mirror_load=\"YES\"' \
-		             $BSDINSTALL_TMPBOOT/loader.conf.gmirror ||
-		             return $FAILURE
-	fi
-
-	# We're all done unless we should go on to do encryption
-	[ "$ZFSBOOT_GELI_ENCRYPTION" ] || return $SUCCESS
-
-	#
-	# Configure geli(8)-based encryption
-	#
-	f_dprintf "$funcname: Configuring disk encryption..."
-	f_eval_catch $funcname echo "$ECHO_APPEND" 'aesni_load=\"YES\"' \
-		$BSDINSTALL_TMPBOOT/loader.conf.aesni || return $FAILURE
-	f_eval_catch $funcname echo "$ECHO_APPEND" 'geom_eli_load=\"YES\"' \
-		$BSDINSTALL_TMPBOOT/loader.conf.geli || return $FAILURE
-
-	# We're all done unless we should go on for boot pool
-	[ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS
-
-	for disk in $disks; do
-		f_eval_catch $funcname printf "$PRINTF_CONF" \
-			geli_%s_keyfile0_load "$disk$targetpart YES" \
-			$BSDINSTALL_TMPBOOT/loader.conf.$disk$targetpart ||
-			return $FAILURE
-		f_eval_catch $funcname printf "$PRINTF_CONF" \
-			geli_%s_keyfile0_type \
-			"$disk$targetpart $disk$targetpart:geli_keyfile0" \
-			$BSDINSTALL_TMPBOOT/loader.conf.$disk$targetpart ||
-			return $FAILURE
-		f_eval_catch $funcname printf "$PRINTF_CONF" \
-			geli_%s_keyfile0_name \
-			"$disk$targetpart \"$ZFSBOOT_GELI_KEY_FILE\"" \
-			$BSDINSTALL_TMPBOOT/loader.conf.$disk$targetpart ||
-			return $FAILURE
-	done
-
-	# Set cachefile for boot pool so it auto-imports at system start
-	f_dprintf "$funcname: Configuring zpool.cache for boot pool..."
-	f_eval_catch $funcname zpool "$ZPOOL_SET" \
-	             "cachefile=\"$BSDINSTALL_CHROOT/boot/zfs/zpool.cache\"" \
-	             "$bootpool_name" || return $FAILURE
-
-	# Some additional geli(8) requirements for loader.conf(5)
-	for option in \
-		'zpool_cache_load=\"YES\"' \
-		'zpool_cache_type=\"/boot/zfs/zpool.cache\"' \
-		'zpool_cache_name=\"/boot/zfs/zpool.cache\"' \
-		'geom_eli_passphrase_prompt=\"YES\"' \
-	; do
-		f_eval_catch $funcname echo "$ECHO_APPEND" "$option" \
-		             $BSDINSTALL_TMPBOOT/loader.conf.zfs ||
-		             return $FAILURE
-	done
-	return $SUCCESS
-}
-
-# dialog_menu_diskinfo
-#
-# Prompt the user to select a disk and then provide detailed info on it.
-#
-dialog_menu_diskinfo()
-{
-	local device disk
-
-	#
-	# Break from loop when user cancels disk selection
-	#
-	while :; do
-		device=$( msg_cancel="$msg_back" f_device_menu \
-			"$DIALOG_TITLE" "$msg_select_a_disk_device" "" \
-			$DEVICE_TYPE_DISK 2>&1 ) || break
-		$device get name disk
-
-		# Show gpart(8) `show' and camcontrol(8) `inquiry' data
-		f_show_msg "$msg_detailed_disk_info" \
-			"$disk" "$( gpart show $disk 2> /dev/null )" \
-			"$disk" "$( camcontrol inquiry $disk 2> /dev/null )" \
-			"$disk" "$( camcontrol identify $disk 2> /dev/null )"
-	done
-
-	return $SUCCESS
-}
-
-############################################################ MAIN
-
-#
-# Initialize
-#
-f_dialog_title "$msg_zfs_configuration"
-f_dialog_backtitle "$msg_freebsd_installer"
-
-# User may have specifically requested ZFS-related operations be interactive
-! f_interactive && f_zfsinteractive && unset $VAR_NONINTERACTIVE
-
-#
-# Debugging
-#
-f_dprintf "BSDINSTALL_CHROOT=[%s]" "$BSDINSTALL_CHROOT"
-f_dprintf "BSDINSTALL_TMPETC=[%s]" "$BSDINSTALL_TMPETC"
-f_dprintf "FSTAB_FMT=[%s]" "$FSTAB_FMT"
-
-#
-# Determine default boot type
-#
-case $(uname -m) in
-arm64|riscv)
-	# We support only UEFI boot for arm64 and riscv.
-	: ${ZFSBOOT_BOOT_TYPE:=UEFI}
-	: ${ZFSBOOT_PARTITION_SCHEME:=GPT}
-	;;
-*)
-	# If the system was booted with UEFI, set the default boot type to UEFI
-	bootmethod=$( sysctl -n machdep.bootmethod )
-	f_dprintf "machdep.bootmethod=[%s]" "$bootmethod"
-	if [ "$bootmethod" = "UEFI" ]; then
-		: ${ZFSBOOT_BOOT_TYPE:=BIOS+UEFI}
-		: ${ZFSBOOT_PARTITION_SCHEME:=GPT}
-	else
-		: ${ZFSBOOT_BOOT_TYPE:=BIOS}
-		: ${ZFSBOOT_PARTITION_SCHEME:=GPT}
-	fi
-	;;
-esac
-
-#
-# Loop over the main menu until we've accomplished what we came here to do
-#
-while :; do
-	if ! f_interactive; then
-		retval=$DIALOG_OK
-		mtag=">>> $msg_install"
-	else
-		dialog_menu_main
-		retval=$?
-		f_dialog_menutag_fetch mtag
-	fi
-
-	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
-	[ $retval -eq $DIALOG_OK ] || f_die
-
-	case "$mtag" in
-	">>> $msg_install")
-		#
-		# First, validate the user's selections
-		#
-
-		# Make sure they gave us a name for the pool
-		if [ ! "$ZFSBOOT_POOL_NAME" ]; then
-			f_dprintf "Pool name cannot be empty."
-			f_show_err "$msg_pool_name_cannot_be_empty"
-			continue
-		fi
-
-		# Validate vdev type against number of disks selected/scripted
-		# (also validates that ZFSBOOT_DISKS are real [probed] disks)
-		# NB: dialog_menu_layout supports running non-interactively
-		dialog_menu_layout || continue
-
-		# Make sure each disk will have room for ZFS
-		if f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize &&
-		   f_expand_number "$ZFSBOOT_BOOT_POOL_SIZE" bootsize &&
-		   f_expand_number "1g" zpoolmin
-		then
-			minsize=$swapsize teeny_disks=
-			if [ "$ZFSBOOT_POOL_SIZE" ]; then
-				f_expand_number "$ZFSBOOT_POOL_SIZE" poolsize
-				minsize=$(( $minsize + $poolsize ))
-			fi
-			[ "$ZFSBOOT_BOOT_POOL" ] &&
-				minsize=$(( $minsize + $bootsize ))
-			for disk in $ZFSBOOT_DISKS; do
-				debug= f_device_find -1 \
-					$disk $DEVICE_TYPE_DISK device
-				$device get capacity disksize || continue
-				[ ${disksize:-0} -ge 0 ] || disksize=0
-				[ $disksize -lt $minsize ] &&
-					teeny_disks="$teeny_disks $disk"
-			done
-			if [ "$teeny_disks" ]; then
-				f_dprintf "swapsize=[%s] bootsize[%s] %s" \
-				          "$ZFSBOOT_SWAP_SIZE" \
-				          "$ZFSBOOT_BOOT_POOL_SIZE" \
-				          "minsize=[$minsize]"
-				f_dprintf "These disks are too small: %s" \
-				          "$teeny_disks"
-				f_show_err "$msg_these_disks_are_too_small" \
-				           "$ZFSBOOT_SWAP_SIZE" \
-				           "$ZFSBOOT_BOOT_POOL_SIZE" \
-				           "$teeny_disks"
-				continue
-			fi
-		fi
-
-		#
-		# Last Chance!
-		#
-		if f_interactive; then
-			dialog_last_chance $ZFSBOOT_DISKS || continue
-		fi
-
-		#
-		# Let's do this
-		#
-
-		vdev_type="$ZFSBOOT_VDEV_TYPE"
-
-		# Blank the vdev type for the default layout
-		[ "$vdev_type" = "stripe" ] && vdev_type=
-
-		zfs_create_boot "$ZFSBOOT_POOL_NAME" \
-		                "$vdev_type" $ZFSBOOT_DISKS || continue
-
-		# To be reused by bootconfig
-		echo "$ZFSBOOT_DISKS" > ${TMPDIR:-"/tmp"}/bsdinstall-zfsboot
-
-		break # to success
-		;;
-	?" $msg_pool_type_disks")
-		ZFSBOOT_CONFIRM_LAYOUT=1
-		dialog_menu_layout
-		# User has poked settings, disable later confirmation
-		ZFSBOOT_CONFIRM_LAYOUT=
-		;;
-	"- $msg_rescan_devices") f_device_rescan ;;
-	"- $msg_disk_info") dialog_menu_diskinfo ;;
-	?" $msg_pool_name")
-		# Prompt the user to input/change the name for the new pool
-		f_dialog_input input \
-			"$msg_please_enter_a_name_for_your_zpool" \
-			"$ZFSBOOT_POOL_NAME" &&
-			ZFSBOOT_POOL_NAME="$input"
-		;;
-	?" $msg_force_4k_sectors")
-		# Toggle the variable referenced both by the menu and later
-		if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
-			ZFSBOOT_FORCE_4K_SECTORS=
-		else
-			ZFSBOOT_FORCE_4K_SECTORS=1
-		fi
-		;;
-	?" $msg_encrypt_disks")
-		# Toggle the variable referenced both by the menu and later
-		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
-			ZFSBOOT_GELI_ENCRYPTION=
-		else
-			ZFSBOOT_FORCE_4K_SECTORS=1
-			ZFSBOOT_GELI_ENCRYPTION=1
-		fi
-		;;
-	?" $msg_partition_scheme")
-		# Toggle between GPT (BIOS), GPT (UEFI) and MBR
-		if [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT" -a \
-		     "$ZFSBOOT_BOOT_TYPE" = "BIOS" ]
-		then
-			ZFSBOOT_PARTITION_SCHEME="GPT"
-			ZFSBOOT_BOOT_TYPE="UEFI"
-		elif [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT" -a \
-		       "$ZFSBOOT_BOOT_TYPE" = "UEFI" ]
-		then
-			ZFSBOOT_PARTITION_SCHEME="GPT"
-			ZFSBOOT_BOOT_TYPE="BIOS+UEFI"
-		elif [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT" ]; then
-			ZFSBOOT_PARTITION_SCHEME="MBR"
-			ZFSBOOT_BOOT_TYPE="BIOS"
-		elif [ "$ZFSBOOT_PARTITION_SCHEME" = "MBR" ]; then
-			ZFSBOOT_PARTITION_SCHEME="GPT + Active"
-			ZFSBOOT_BOOT_TYPE="BIOS"
-		elif [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT + Active" ]; then
-			ZFSBOOT_PARTITION_SCHEME="GPT + Lenovo Fix"
-			ZFSBOOT_BOOT_TYPE="BIOS"
-		else
-			ZFSBOOT_PARTITION_SCHEME="GPT"
-			ZFSBOOT_BOOT_TYPE="BIOS"
-		fi
-		;;
-	?" $msg_swap_size")
-		# Prompt the user to input/change the swap size for each disk
-		while :; do
-		    f_dialog_input input \
-			    "$msg_please_enter_amount_of_swap_space" \
-			    "$ZFSBOOT_SWAP_SIZE" &&
-			    ZFSBOOT_SWAP_SIZE="${input:-0}"
-		    if f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize
-		    then
-			if [ $swapsize -ne 0 -a $swapsize -lt 104857600 ]; then
-			    f_show_err "$msg_swap_toosmall" \
-				       "$ZFSBOOT_SWAP_SIZE"
-			    continue;
-			else
-			    break;
-			fi
-		    else
-			f_show_err "$msg_swap_invalid" \
-				   "$ZFSBOOT_SWAP_SIZE"
-			continue;
-		    fi
-		done
-		;;
-	?" $msg_swap_mirror")
-		# Toggle the variable referenced both by the menu and later
-		if [ "$ZFSBOOT_SWAP_MIRROR" ]; then
-			ZFSBOOT_SWAP_MIRROR=
-		else
-			ZFSBOOT_SWAP_MIRROR=1
-		fi
-		;;
-	?" $msg_swap_encrypt")
-		# Toggle the variable referenced both by the menu and later
-		if [ "$ZFSBOOT_SWAP_ENCRYPTION" ]; then
-			ZFSBOOT_SWAP_ENCRYPTION=
-		else
-			ZFSBOOT_SWAP_ENCRYPTION=1
-		fi
-		;;
-	esac
-done
-
-exit $SUCCESS
-
-################################################################################
-# END
-################################################################################