Add support for optional distributions, installation of the ports tree and

src. Fitting all of this on a single CD along with a full system requires
changing the default compression algorithm from gzip to xz.

3 files changed, 23 insertions, 2 deletions

diff --git a/usr.sbin/bsdinstall/bsdinstall b/usr.sbin/bsdinstall/bsdinstall
index 04162c8..04223d0 100755
--- a/usr.sbin/bsdinstall/bsdinstall
+++ b/usr.sbin/bsdinstall/bsdinstall
@@ -26,7 +26,6 @@
 #
 # $FreeBSD$
 
-: ${DISTRIBUTIONS="kernel.tgz world.tgz"}; export DISTRIBUTIONS
 : ${BSDINSTALL_LOG="/tmp/bsdinstall_log"}; export BSDINSTALL_LOG
 : ${BSDINSTALL_TMPETC="/tmp/bsdinstall_etc"}; export BSDINSTALL_TMPETC
 : ${PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"}; export PATH_FSTAB
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index 5fc8f0e..7234ad8 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -50,6 +50,27 @@ bsdinstall keymap
 trap error SIGINT	# Catch cntrl-C here
 bsdinstall hostname || error
 
+LIB32=""
+[ `uname -p` = amd64 -o `uname -p` = powerpc64 ] && \
+    LIB32="lib32 \"32-bit compatibility\" on"
+
+DISTMENU="doc	\"Additional documentation\" on \
+	games	\"Games (fortune, etc.)\" on \
+	$LIB32 \
+	ports	\"Ports tree\" on \
+	src	\"System source code\" off"
+
+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)
+DISTRIBUTIONS="base.txz kernel.txz"
+for dist in $EXTRA_DISTS; do
+	export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
+done
+
 FETCH_DISTRIBUTIONS=""
 for dist in $DISTRIBUTIONS; do
 	if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then
diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail
index d1adebb..0e6ba79 100755
--- a/usr.sbin/bsdinstall/scripts/jail
+++ b/usr.sbin/bsdinstall/scripts/jail
@@ -29,7 +29,8 @@
 echo "Begun Installation at $(date)" > $BSDINSTALL_LOG
 
 export BSDINSTALL_CHROOT=$1
-export DISTRIBUTIONS="`echo $DISTRIBUTIONS | sed 's/kernel\.[^ ]* //g'`"
+export DISTRIBUTIONS="kernel.txz base.txz doc.txz games.txz"
+[ `uname -p` = amd64 -o `uname -p` = powerpc64 ] && export DISTRIBUTIONS="$DISTRIBUTIONS lib32.txz"
 
 error() {
 	dialog --backtitle "FreeBSD Installer" --title "Abort" \