bsdinstall: remove EOL whitespace

This commit is contained in:
Ed Maste 2017-07-18 23:35:19 +00:00
parent ad6b4a346f
commit 9acc904146
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=321178
7 changed files with 9 additions and 9 deletions

View File

@ -319,7 +319,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS" export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS"
export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST" export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST"
fi fi
export FTP_PASSIVE_MODE=YES export FTP_PASSIVE_MODE=YES
# Iterate through the distribution list and set a flag if debugging # Iterate through the distribution list and set a flag if debugging
# distributions have been selected. # distributions have been selected.
@ -413,7 +413,7 @@ finalconfig() {
finalconfig finalconfig
;; ;;
"Root Password") "Root Password")
bsdinstall rootpass bsdinstall rootpass
finalconfig finalconfig
;; ;;
"Hostname") "Hostname")

View File

@ -32,7 +32,7 @@ percentage=0
for dist in $DISTRIBUTIONS; do for dist in $DISTRIBUTIONS; do
distname=$(basename $dist .txz) distname=$(basename $dist .txz)
eval "status_$distname=7" eval "status_$distname=7"
items="" items=""
for i in $DISTRIBUTIONS; do for i in $DISTRIBUTIONS; do
items="$items $i `eval echo \\\${status_$(basename $i .txz):-Pending}`" items="$items $i `eval echo \\\${status_$(basename $i .txz):-Pending}`"

View File

@ -28,7 +28,7 @@
# $FreeBSD$ # $FreeBSD$
# #
############################################################ INCLUDES ############################################################ INCLUDES
BSDCFG_SHARE="/usr/share/bsdconfig" BSDCFG_SHARE="/usr/share/bsdconfig"
. $BSDCFG_SHARE/common.subr || exit 1 . $BSDCFG_SHARE/common.subr || exit 1
f_dprintf "%s: loading includes..." "$0" f_dprintf "%s: loading includes..." "$0"

View File

@ -33,7 +33,7 @@ cat $PATH_FSTAB | awk -v BSDINSTALL_CHROOT=$BSDINSTALL_CHROOT '{
fsname = $2; fsname = $2;
if (fsname == "/") if (fsname == "/")
fsname = "" fsname = ""
printf("%s\t%s%s\t%s\t%s\t%s\t%s\n", $1, BSDINSTALL_CHROOT, printf("%s\t%s%s\t%s\t%s\t%s\t%s\n", $1, BSDINSTALL_CHROOT,
fsname, $3, $4, $5, $6); fsname, $3, $4, $5, $6);
} }
}' > $TMP_FSTAB }' > $TMP_FSTAB

View File

@ -75,7 +75,7 @@ IF_CONFIG=$(dialog --backtitle 'FreeBSD Installer' --title 'Network Configuratio
if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
exec 3>&- exec 3>&-
echo $INTERFACE $IF_CONFIG | echo $INTERFACE $IF_CONFIG |
awk -v prefix="$IFCONFIG_PREFIX" '{ awk -v prefix="$IFCONFIG_PREFIX" '{
printf("ifconfig_%s=\"%s\inet %s netmask %s\"\n", $1, prefix, $2, $3); printf("ifconfig_%s=\"%s\inet %s netmask %s\"\n", $1, prefix, $2, $3);
printf("defaultrouter=\"%s\"\n", $4); printf("defaultrouter=\"%s\"\n", $4);

View File

@ -41,9 +41,9 @@ f_include $BSDCFG_SHARE/dialog.subr
############################################################ MAIN ############################################################ MAIN
# #
# TODO: # TODO:
# - Add DHCPv6 support once FreeBSD ships with it. # - Add DHCPv6 support once FreeBSD ships with it.
# #
INTERFACE=$1 INTERFACE=$1
case "${INTERFACE}" in case "${INTERFACE}" in

View File

@ -33,7 +33,7 @@ cat $PATH_FSTAB | awk -v BSDINSTALL_CHROOT=$BSDINSTALL_CHROOT '{
fsname = $2; fsname = $2;
if (fsname == "/") if (fsname == "/")
fsname = "" fsname = ""
printf("%s\t%s%s\t%s\t%s\t%s\t%s\n", $1, BSDINSTALL_CHROOT, printf("%s\t%s%s\t%s\t%s\t%s\t%s\n", $1, BSDINSTALL_CHROOT,
fsname, $3, $4, $5, $6); fsname, $3, $4, $5, $6);
} }
}' > $TMP_FSTAB }' > $TMP_FSTAB