svn commit: r218947 - in head/usr.sbin/bsdinstall: . scripts
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Tue Feb 22 13:56:59 UTC 2011
Author: nwhitehorn
Date: Tue Feb 22 13:56:59 2011
New Revision: 218947
URL: http://svn.freebsd.org/changeset/base/218947
Log:
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.
Modified:
head/usr.sbin/bsdinstall/bsdinstall
head/usr.sbin/bsdinstall/scripts/auto
head/usr.sbin/bsdinstall/scripts/jail
Modified: head/usr.sbin/bsdinstall/bsdinstall
==============================================================================
--- head/usr.sbin/bsdinstall/bsdinstall Tue Feb 22 13:52:03 2011 (r218946)
+++ head/usr.sbin/bsdinstall/bsdinstall Tue Feb 22 13:56:59 2011 (r218947)
@@ -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
Modified: head/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/auto Tue Feb 22 13:52:03 2011 (r218946)
+++ head/usr.sbin/bsdinstall/scripts/auto Tue Feb 22 13:56:59 2011 (r218947)
@@ -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
Modified: head/usr.sbin/bsdinstall/scripts/jail
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/jail Tue Feb 22 13:52:03 2011 (r218946)
+++ head/usr.sbin/bsdinstall/scripts/jail Tue Feb 22 13:56:59 2011 (r218947)
@@ -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" \
More information about the svn-src-all
mailing list