aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/bsdinstall/scripts/auto
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-07-09 23:01:54 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-07-09 23:01:54 +0000
commitbfc3bab8655cc6ab122d387da2bb91d01db3646e (patch)
tree165f94145ebb3379b5e3e0691989ce863f896595 /usr.sbin/bsdinstall/scripts/auto
parent5863e1bc8cc14c9712b67428bad68d982c03d248 (diff)
downloadsrc-bfc3bab8655cc6ab122d387da2bb91d01db3646e.tar.gz
src-bfc3bab8655cc6ab122d387da2bb91d01db3646e.zip
Per request of the docs team, install docs as packages, instead of via
the normal distfile mechanism. Thanks to Marc Fonvieille for the patch and for putting up with me taking entirely too long to commit this! Submitted by: blackend
Notes
Notes: svn path=/head/; revision=223897
Diffstat (limited to 'usr.sbin/bsdinstall/scripts/auto')
-rwxr-xr-xusr.sbin/bsdinstall/scripts/auto7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index bdc5fc4d2f27..667ced442a27 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -127,7 +127,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
# Try to use any existing distfiles
if [ -d $BSDINSTALL_DISTDIR ]; then
DISTDIR_IS_UNIONFS=1
- mount_unionfs "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR"
+ mount_nullfs -o union "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR"
fi
# Otherwise, fetch everything
@@ -166,6 +166,7 @@ finalconfig() {
"Network" "Networking configuration" \
"Services" "Set daemons to run on startup" \
"Time Zone" "Set system timezone" \
+ "Handbook" "Install FreeBSD Handbook (requires network)" \
"Shell" "Open a shell in the new system" \
"Exit" "Apply configuration and exit installer" 2>&1 1>&3)
exec 3>&-
@@ -195,6 +196,10 @@ finalconfig() {
bsdinstall time
finalconfig
;;
+ "Handbook")
+ bsdinstall docsinstall
+ finalconfig
+ ;;
"Shell")
clear
echo This shell is operating in a chroot in the new system. \