Page MenuHomeFreeBSD
Files F154472662

D53177.id164457.diff
No OneTemporary
Actions

D53177.id164457.diff
View Options

diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail
--- a/usr.sbin/bsdinstall/scripts/jail
+++ b/usr.sbin/bsdinstall/scripts/jail
@@ -79,9 +79,10 @@
: ${DISTRIBUTIONS="base.txz"}; export DISTRIBUTIONS
if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
- DISTMENU=`cut -f 4,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base`
+ DISTMENU=`cut -f 1,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base`
+ DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')"
- if [ ! "$nonInteractive" == "YES" ]
+ if [ ! "$nonInteractive" = "YES" ]
then
exec 5>&1
EXTRA_DISTS=$(echo $DISTMENU | xargs -o bsddialog \
@@ -173,7 +174,7 @@
. $TMPDIR/bsdinstall-installscript-preamble
fi
-if [ ! "$nonInteractive" == "YES" ]; then
+if [ ! "$nonInteractive" = "YES" ]; then
bsddialog --backtitle "$OSNAME Installer" --title "Select Installation Type" \
--yes-label "Distribution Sets" --no-label "Packages (Tech Preview)" --yesno \
"Would you like to install the base system using traditional distribution sets or packages (technology preview)?" 0 0
@@ -182,20 +183,20 @@
fi
fi
-if [ "$PKGBASE" == yes ]; then
+if [ "$PKGBASE" = yes ]; then
bsdinstall pkgbase --jail || error "Installation of base system packages failed"
else
distbase
fi
-if [ ! "$nonInteractive" == "YES" ]
+if [ ! "$nonInteractive" = "YES" ]
then
bsdinstall rootpass || error "Could not set root password"
fi
trap true SIGINT # This section is optional
-if [ ! "$nonInteractive" == "YES" ]
+if [ ! "$nonInteractive" = "YES" ]
then
bsdinstall services

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 29, 5:11 PM (8 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32364270
Default Alt Text
D53177.id164457.diff (1 KB)

Event Timeline