diff options
| author | Renato Botelho <renato@netgate.com> | 2021-07-22 20:02:34 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2021-07-27 20:05:08 +0000 |
| commit | 3312bc6f109d16d082db771c38832649a668c4de (patch) | |
| tree | da3c6db887672deddbf447557f17b12b0118de6d | |
| parent | 76b5de00137a7ba8a872ce18e9ccacdb11acac8c (diff) | |
bsdinstall: Only show menu if there are more items to be installed
Obtained from: Rubicon Communications, LLC ("Netgate")
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 95f0da5be1e3456c930f5f9538cbc099c65f2014)
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/auto | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index f86ccb62c179..7e19f29c757f 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -118,16 +118,18 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')" - exec 3>&1 - EXTRA_DISTS=$( eval dialog \ - --backtitle \"FreeBSD Installer\" \ - --title \"Distribution Select\" --nocancel --separate-output \ - --checklist \"Choose optional system components to install:\" \ - 0 0 0 $DISTMENU \ - 2>&1 1>&3 ) - for dist in $EXTRA_DISTS; do - export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" - done + if [ -n "$DISTMENU" ]; then + exec 3>&1 + EXTRA_DISTS=$( eval dialog \ + --backtitle \"FreeBSD Installer\" \ + --title \"Distribution Select\" --nocancel --separate-output \ + --checklist \"Choose optional system components to install:\" \ + 0 0 0 $DISTMENU \ + 2>&1 1>&3 ) + for dist in $EXTRA_DISTS; do + export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" + done + fi fi LOCAL_DISTRIBUTIONS="MANIFEST" |