diff options
author | Renato Botelho <renato@netgate.com> | 2016-06-27 20:09:38 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-06-27 20:09:38 -0300 |
commit | 0b8a6d65e1b35bea04b708bea15e1d516ff2d6f4 (patch) | |
tree | a6648c2a52184e41b2832a587fbe70ddb5efe494 /usr.sbin/bsdinstall | |
parent | 6d946ca00d57a6e1622c78b00d1861de8e4252d6 (diff) | |
download | FreeBSD-src-0b8a6d65e1b35bea04b708bea15e1d516ff2d6f4.zip FreeBSD-src-0b8a6d65e1b35bea04b708bea15e1d516ff2d6f4.tar.gz |
Only show menu if there are more items to be installed
Diffstat (limited to 'usr.sbin/bsdinstall')
-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 ecdc925..3bfc7ce 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" |