bc4a673f89
+ Add a `-D FILE" command-line option for overriding the path to the bsdinstall log file (BSDINSTALL_LOG env var). + Document new `-D FILE' in the man page for bsdinstall. + If FILE in `-D FILE' begins with a +, debug output goes to stdout (interleaved between dialog(1) invocations/output) as well as to FILE (minus the leading + of course). + If BSDINSTALL_LOG cannot be written, then debugging is disabled (except in the case of a leading + in the pathname, wherein debug will still be printed to stdout). + Update source code formatting style. + Fix a dangling participle ("Begun ..." -> "Began ...") + Rewrite the docsinstall script (was necessary to abate direct dependency on BSDINSTALL_LOG (instead, use fault-tolerant bsdconfig framework which displays appropriate errors for package management). NB: docsinstall is still using pkg(8) after this change. + Add additional debug output for dhclient/rtsol/wpa_cliscan + Display script errors in a textbox rather than just on stdout + Update many coments. + Add new f_show_err() API call (like f_show_msg but changes the dialog title to "Error")(see bsdconfig's `common.subr'). + Add new f_eval_catch() API call for executing a command via eval but not before logging the command to debug. Several example cases documented in API header for function in bsdconfig's `common.subr'. + Fix dialog auto-sizing when launched as an rvalue to a pipe for indirected scripts (previously would default to 24x80 sizing in this case, now it can autosize to full size even when in a pipe chain). + Fix bug in f_snprintf if $format argument began with "-"; printf would misinterpret as a flag. (this is in bsdcofig's `strings.subr'). + Add accompanying f_sprintf() and f_vsprintf() to go along with already existing f_snprintf() and f_vsnprintf() (see bsdconfig's `strings.subr'). + Remove some unnecessary default ZFS datasets from the automatic "zfsboot" script. Such as: /usr/ports/distfiles /usr/ports/packages /usr/obj /var/db /var/empty /var/mail and /var/run (these can all be created as-needed once the system is installed). + Remove setuid=off for /usr/home (as discussed from last round of CFT). + Fix some i18n string violations in "zfsboot". + Bolster debugging output in "zfsboot". + Fix some string quoting issues in "zfsboot". + Fix some variable scope issues in "zfsboot". + Change "Create" to "Install" in "zfsboot" main menu. + Increase error checking in "zfsboot" (type-check arguments and such). + Add call to "graid destroy" killing automatic metadata (part of the series of pedantic destructions we do when bootstrapping a new/naked disk). + Make judicious use of new f_eval_catch() in "zfsboot". + Fixup some variable names for consistency (zfsboot). + Fix an underride syntax parameter expansion folly (zfsboot). + Confirm layout if not explicitly chosen when blindly proceeding (no longer have to touch anything on the ZFS menu if it scares you, just choose the omnibus "Install" option at the top and you'll be prompted to select vdev type and disks in the layout confirmation dialog). + Change numbered menu items to alphabetic for more efficient navigation. + Consolidate vdev selection and disk selection into a single stateful menu which performs validation and allows backing out to each previous menu as you go deeper. + Redesign the ``Last Chance'' dialog (still using the same colors, but make it conform to a tolerable width and make disks appear in a block- quote style indented region). + Fix a bug wherein we used the a lowercase variable name by accident (actual variable name declared as all-uppercase) at the time of initializing fstab(5) (not believed to cause any issues though). + Update the geli setup infobox for each provider being initialized (not just at the onset -- since each ``geli init'' causes kernel messages to push our infobox off-screen). Reviewed by: Allan Jude <freebsd@allanjude.com> Discussed on: -current MFC after: 3 days
157 lines
4.7 KiB
Bash
Executable File
157 lines
4.7 KiB
Bash
Executable File
#!/bin/sh
|
|
#-
|
|
# Copyright (c) 2011 Nathan Whitehorn
|
|
# Copyright (c) 2011 The FreeBSD Foundation
|
|
# Copyright (c) 2013 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
|
|
|
|
if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
|
|
. $BSDINSTALL_TMPETC/._rc.conf.net
|
|
ifconfig ${INTERFACE} `eval echo \\\$ifconfig_${INTERFACE}_ipv6`
|
|
if [ -n "${ipv6_defaultrouter}" ]; then
|
|
route delete -inet6 default
|
|
route add -inet6 default ${ipv6_defaultrouter}
|
|
fi
|
|
fi
|
|
|
|
################################################################################
|
|
# END
|
|
################################################################################
|