summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/Makefile4
-rw-r--r--release/Makefile32
-rwxr-xr-xrelease/scripts/base-install.sh2
-rwxr-xr-xrelease/scripts/bin-install.sh2
-rwxr-xr-xrelease/scripts/dict-make.sh10
-rwxr-xr-xrelease/scripts/doc-make.sh6
-rwxr-xr-xrelease/scripts/games-make.sh18
-rwxr-xr-xrelease/scripts/info-make.sh6
-rwxr-xr-xrelease/scripts/manpages-make.sh8
-rwxr-xr-xrelease/scripts/proflibs-make.sh2
-rw-r--r--share/mk/bsd.info.mk2
-rw-r--r--share/mk/bsd.lib.mk2
-rw-r--r--share/mk/bsd.nls.mk2
-rw-r--r--share/mk/bsd.prog.mk2
-rw-r--r--share/mk/bsd.subdir.mk4
-rw-r--r--usr.sbin/sade/menus.c8
-rw-r--r--usr.sbin/sysinstall/dist.c8
-rw-r--r--usr.sbin/sysinstall/dist.h4
-rw-r--r--usr.sbin/sysinstall/doc.c2
-rw-r--r--usr.sbin/sysinstall/installUpgrade.c22
-rw-r--r--usr.sbin/sysinstall/menus.c8
21 files changed, 77 insertions, 77 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 0a341bf..986aa16 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -60,9 +60,9 @@ FREEBSD+= ${COPYRIGHT}
etc:
distribute:
- cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/bin
+ cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
.if defined(OBJFORMAT)
- echo OBJFORMAT=${OBJFORMAT} > ${DISTDIR}/bin/etc/objformat
+ echo OBJFORMAT=${OBJFORMAT} > ${DISTDIR}/${DISTRIBUTION}/etc/objformat
.endif
@echo
diff --git a/release/Makefile b/release/Makefile
index 791404c..aab01fe 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -122,7 +122,7 @@ DIST_DOCS_ARCH_DEP= installation relnotes hardware
.endif
# Things which without too much trouble can be considered variables
-# BIN_DISTS are special in that they get full /etc installation sets.
+# BASE_DISTS are special in that they get full /etc installation sets.
#
.if ${MACHINE_ARCH} == "i386"
COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x
@@ -131,8 +131,8 @@ COMPAT_DISTS?= compat4x
.endif
OTHER_DISTS?= manpages catpages games proflibs dict info doc
CRYPTO_DISTS?= crypto krb4 krb5
-BIN_DISTS?= bin
-DISTRIBUTIONS?= ${BIN_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
+BASE_DISTS?= base
+DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
KERNELS?= GENERIC
BOOT1= etc/defaults/rc.conf
@@ -436,7 +436,7 @@ release.1:
# Install the system into the various distributions.
release.2:
- cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/bin
+ cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base
cd ${.CURDIR}/.. && make distribworld DISTDIR=${RD}/trees
.if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
cd ${.CURDIR}/../kerberosIV && ( \
@@ -463,12 +463,12 @@ release.3:
rm -rf ${.CURDIR}/../sys/${MACHINE}/compile/${kernel}
cd ${.CURDIR} && ${MAKE} doSTDKERNEL KERNEL=${kernel} KODIR=/${kernel}
rm -rf ${.CURDIR}/../sys/${MACHINE}/compile/${kernel}
- -mkdir ${RD}/trees/bin/boot/${kernel}
- cp -p ${RD}/kernels/${kernel}/kernel ${RD}/trees/bin/boot/${kernel}
+ -mkdir ${RD}/trees/base/boot/${kernel}
+ cp -p ${RD}/kernels/${kernel}/kernel ${RD}/trees/base/boot/${kernel}
.endfor
# Install a standard boot kernel+modules
- mkdir -p ${RD}/trees/bin/boot/kernel
- cp -Rp ${RD}/kernels/GENERIC/* ${RD}/trees/bin/boot/kernel
+ mkdir -p ${RD}/trees/base/boot/kernel
+ cp -Rp ${RD}/kernels/GENERIC/* ${RD}/trees/base/boot/kernel
touch release.3
# Make and install the three crunched binaries which live on the floppies.
@@ -603,7 +603,7 @@ release.8:
mkdir -p etc/defaults dev mnt stand/help
@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
DIR=${RD}/mfsfd/stand ZIP=false
- ( cd ${RD}/trees/bin/dev && \
+ ( cd ${RD}/trees/base/dev && \
ls console tty bpf0 ttyd0 ttyv0 ttyv1 ttyv2 ttyv3 null zero card0 card1 card2 card3 usb usb0 uhid0 ums0 ulpt0 ugen0 kbd0 kmem mem xpt0 | \
cpio -dump ${RD}/mfsfd/dev )
( cd ${RD}/mfsfd/dev && rm -f *[swo]d*[bdefgh] )
@@ -616,10 +616,10 @@ release.8:
cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf
.endif
cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
- cd ${RD}/trees/bin && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand
+ cd ${RD}/trees/base && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand
( for F in netconfig protocols ; do \
sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
- ${RD}/trees/bin/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
+ ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
done )
grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \
${.CURDIR}/../etc/services | \
@@ -694,11 +694,11 @@ release.9:
@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=fixit \
DIR=${RD}/fixitfd/stand ZIP=false
@( cd ${RD}/fixitfd/dev && \
- cp ${RD}/trees/bin/dev/MAKEDEV MAKEDEV && \
+ cp ${RD}/trees/base/dev/MAKEDEV MAKEDEV && \
chmod 755 MAKEDEV)
- @cp ${RD}/trees/bin/etc/spwd.db ${RD}/trees/bin/etc/group \
- ${RD}/trees/bin/etc/protocols ${RD}/fixitfd/etc
- @cp ${RD}/trees/bin/usr/share/misc/scsi_modes \
+ @cp ${RD}/trees/base/etc/spwd.db ${RD}/trees/base/etc/group \
+ ${RD}/trees/base/etc/protocols ${RD}/fixitfd/etc
+ @cp ${RD}/trees/base/usr/share/misc/scsi_modes \
${RD}/fixitfd/usr/share/misc
@cp ${.CURDIR}/fixit.profile ${RD}/fixitfd/.profile
@cp ${.CURDIR}/fixit.services ${RD}/fixitfd/etc/services
@@ -825,7 +825,7 @@ doc.1:
@for i in ${DOCPORTS}; do \
cd /usr/ports/$$i && make all install clean BATCH=yes JADETEX=no FORCE_PKG_REGISTER=yes; \
done
- @cd /usr/doc && make all install 'FORMATS=html html-split txt' INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/bin/usr/share/doc
+ @cd /usr/doc && make all install 'FORMATS=html html-split txt' INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc
touch doc.1
#
diff --git a/release/scripts/base-install.sh b/release/scripts/base-install.sh
index 5d6fc45..c87a38b 100755
--- a/release/scripts/base-install.sh
+++ b/release/scripts/base-install.sh
@@ -12,5 +12,5 @@ echo "You are about to extract the base distribution into ${DESTDIR:-/} - are yo
echo -n "you want to do this over your installed system (y/n)? "
read ans
if [ "$ans" = "y" ]; then
- cat bin.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
+ cat base.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
fi
diff --git a/release/scripts/bin-install.sh b/release/scripts/bin-install.sh
index 5d6fc45..c87a38b 100755
--- a/release/scripts/bin-install.sh
+++ b/release/scripts/bin-install.sh
@@ -12,5 +12,5 @@ echo "You are about to extract the base distribution into ${DESTDIR:-/} - are yo
echo -n "you want to do this over your installed system (y/n)? "
read ans
if [ "$ans" = "y" ]; then
- cat bin.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
+ cat base.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
fi
diff --git a/release/scripts/dict-make.sh b/release/scripts/dict-make.sh
index 355d6ff..2e4d322 100755
--- a/release/scripts/dict-make.sh
+++ b/release/scripts/dict-make.sh
@@ -4,15 +4,15 @@
#
# Move the dict stuff out to its own dist
-if [ -d ${RD}/trees/bin/usr/share/dict ]; then
- tar -cf - -C ${RD}/trees/bin/usr/share/dict . |
+if [ -d ${RD}/trees/base/usr/share/dict ]; then
+ tar -cf - -C ${RD}/trees/base/usr/share/dict . |
tar -xpf - -C ${RD}/trees/dict/usr/share/dict &&
- rm -rf ${RD}/trees/bin/usr/share/dict;
+ rm -rf ${RD}/trees/base/usr/share/dict;
fi
for i in airport birthtoken flowers inter.phone na.phone zipcodes; do
- if [ -f ${RD}/trees/bin/usr/share/misc/$i ]; then
- mv ${RD}/trees/bin/usr/share/misc/$i \
+ if [ -f ${RD}/trees/base/usr/share/misc/$i ]; then
+ mv ${RD}/trees/base/usr/share/misc/$i \
${RD}/trees/dict/usr/share/misc;
fi;
done
diff --git a/release/scripts/doc-make.sh b/release/scripts/doc-make.sh
index 2cb4029..0335540 100755
--- a/release/scripts/doc-make.sh
+++ b/release/scripts/doc-make.sh
@@ -4,8 +4,8 @@
#
# Create the doc dist.
-if [ -d ${RD}/trees/bin/usr/share/doc ]; then
- ( cd ${RD}/trees/bin/usr/share/doc;
+if [ -d ${RD}/trees/base/usr/share/doc ]; then
+ ( cd ${RD}/trees/base/usr/share/doc;
find . | cpio -dumpl ${RD}/trees/doc/usr/share/doc ) &&
- rm -rf ${RD}/trees/bin/usr/share/doc
+ rm -rf ${RD}/trees/base/usr/share/doc
fi
diff --git a/release/scripts/games-make.sh b/release/scripts/games-make.sh
index de839e2..6e83d14 100755
--- a/release/scripts/games-make.sh
+++ b/release/scripts/games-make.sh
@@ -4,22 +4,22 @@
#
# Move all the games out to their own dist
-if [ -d ${RD}/trees/bin/usr/games ]; then
- tar -cf - -C ${RD}/trees/bin/usr/games . |
+if [ -d ${RD}/trees/base/usr/games ]; then
+ tar -cf - -C ${RD}/trees/base/usr/games . |
tar -xpf - -C ${RD}/trees/games/usr/games &&
- rm -rf ${RD}/trees/bin/usr/games;
+ rm -rf ${RD}/trees/base/usr/games;
fi
-if [ -d ${RD}/trees/bin/usr/share/games ]; then
- tar -cf - -C ${RD}/trees/bin/usr/share/games . |
+if [ -d ${RD}/trees/base/usr/share/games ]; then
+ tar -cf - -C ${RD}/trees/base/usr/share/games . |
tar -xpf - -C ${RD}/trees/games/usr/share/games &&
- rm -rf ${RD}/trees/bin/usr/share/games;
+ rm -rf ${RD}/trees/base/usr/share/games;
fi
-if [ -d ${RD}/trees/bin/var/games ]; then
- tar -cf - -C ${RD}/trees/bin/var/games . |
+if [ -d ${RD}/trees/base/var/games ]; then
+ tar -cf - -C ${RD}/trees/base/var/games . |
tar -xpf - -C ${RD}/trees/games/var/games &&
- rm -rf ${RD}/trees/bin/var/games;
+ rm -rf ${RD}/trees/base/var/games;
fi
if [ -d ${RD}/trees/manpages/usr/share/man/man6 ]; then
diff --git a/release/scripts/info-make.sh b/release/scripts/info-make.sh
index faa3d0c..12fd29d 100755
--- a/release/scripts/info-make.sh
+++ b/release/scripts/info-make.sh
@@ -4,8 +4,8 @@
#
# Move the info files out to their own dist
-if [ -d ${RD}/trees/bin/usr/share/info ]; then
- tar -cf - -C ${RD}/trees/bin/usr/share/info . |
+if [ -d ${RD}/trees/base/usr/share/info ]; then
+ tar -cf - -C ${RD}/trees/base/usr/share/info . |
tar -xpf - -C ${RD}/trees/info/usr/share/info &&
- rm -rf ${RD}/trees/bin/usr/share/info;
+ rm -rf ${RD}/trees/base/usr/share/info;
fi
diff --git a/release/scripts/manpages-make.sh b/release/scripts/manpages-make.sh
index fae9dd3..bb1326f 100755
--- a/release/scripts/manpages-make.sh
+++ b/release/scripts/manpages-make.sh
@@ -3,10 +3,10 @@
# $FreeBSD$
#
-# Move all the manpages out to their own dist, using the bin dist as a
+# Move all the manpages out to their own dist, using the base dist as a
# starting point.
-if [ -d ${RD}/trees/bin/usr/share/man ]; then
- ( cd ${RD}/trees/bin/usr/share/man;
+if [ -d ${RD}/trees/base/usr/share/man ]; then
+ ( cd ${RD}/trees/base/usr/share/man;
find . | cpio -dumpl ${RD}/trees/manpages/usr/share/man > /dev/null 2>&1) &&
- rm -rf ${RD}/trees/bin/usr/share/man;
+ rm -rf ${RD}/trees/base/usr/share/man;
fi
diff --git a/release/scripts/proflibs-make.sh b/release/scripts/proflibs-make.sh
index 0c5e699..e03b8b2 100755
--- a/release/scripts/proflibs-make.sh
+++ b/release/scripts/proflibs-make.sh
@@ -4,7 +4,7 @@
#
# Move the profiled libraries out to their own dist
-for i in ${RD}/trees/bin/usr/lib/*_p.a; do
+for i in ${RD}/trees/base/usr/lib/*_p.a; do
if [ -f $i ]; then
mv $i ${RD}/trees/proflibs/usr/lib;
fi;
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index d4f3790..c4ce872 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -159,7 +159,7 @@ ${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE}
.PHONY: ${INSTALLINFODIRS}
-DISTRIBUTION?= bin
+DISTRIBUTION?= base
.if !target(distribute)
distribute:
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index a84872a..7998ac8 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -354,7 +354,7 @@ afterinstall: maninstall
.endif
.endif
-DISTRIBUTION?= bin
+DISTRIBUTION?= base
.if !target(distribute)
distribute:
.for dist in ${DISTRIBUTION}
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index c7ed6da..6d53f87 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -117,7 +117,7 @@ realinstall: beforeinstall
all: all-nls
install: realinstall afterinstall
-DISTRIBUTION?= bin
+DISTRIBUTION?= base
.if !target(distribute)
distribute:
.for dist in ${DISTRIBUTION}
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 7c7826c..94d07da 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -205,7 +205,7 @@ afterinstall: maninstall
.endif
.endif
-DISTRIBUTION?= bin
+DISTRIBUTION?= base
.if !target(distribute)
distribute:
.for dist in ${DISTRIBUTION}
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index cea0779..5ec5458 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -12,7 +12,7 @@
#
# +++ variables +++
#
-# DISTRIBUTION Name of distribution. [bin]
+# DISTRIBUTION Name of distribution. [base]
#
# SUBDIR A list of subdirectories that should be built as well.
# Each of the targets will execute the same target in the
@@ -75,7 +75,7 @@ afterinstall: realinstall
realinstall: beforeinstall
.endif
-DISTRIBUTION?= bin
+DISTRIBUTION?= base
.if !target(afterdistribute)
afterdistribute:
.endif
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 9ff0696..7d97484 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -156,7 +156,7 @@ checkDistXUser(dialogMenuItem *self)
static int
checkDistMinimum(dialogMenuItem *self)
{
- return Dists == (DIST_BIN | DIST_CRYPTO);
+ return Dists == (DIST_BASE | DIST_CRYPTO);
}
static int
@@ -776,7 +776,7 @@ DMenu MenuSubDistributions = {
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
"Select the distributions you wish to install.",
"Please check off the distributions you wish to install. At the\n"
- "very minimum, this should be \"bin\".",
+ "very minimum, this should be \"base\".",
NULL,
NULL,
{ { "X Exit", "Exit this menu (returning to previous)",
@@ -785,8 +785,8 @@ DMenu MenuSubDistributions = {
NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
{ "Reset", "Reset all of the below",
NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
- { " bin", "Binary base distribution (required)",
- dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
+ { " base", "Binary base distribution (required)",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BASE },
#ifdef __i386__
{ " compat1x", "FreeBSD 1.x binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 7c94073..722fe67 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -65,7 +65,7 @@ extern Distribution XF86ServerDistTable[];
/* The top-level distribution categories */
static Distribution DistTable[] = {
-{ "bin", "/", &Dists, DIST_BIN, NULL },
+{ "base", "/", &Dists, DIST_BASE, NULL },
{ "doc", "/", &Dists, DIST_DOC, NULL },
{ "games", "/", &Dists, DIST_GAMES, NULL },
{ "manpages", "/", &Dists, DIST_MANPAGES, NULL },
@@ -359,7 +359,7 @@ int
distSetMinimum(dialogMenuItem *self)
{
distReset(NULL);
- Dists = DIST_BIN | DIST_CRYPTO;
+ Dists = DIST_BASE | DIST_CRYPTO;
CRYPTODists |= DIST_CRYPTO_CRYPTO;
distVerifyFlags();
return DITEM_SUCCESS | DITEM_REDRAW;
@@ -688,7 +688,7 @@ distExtract(char *parent, Distribution *me)
total = 0;
(void)gettimeofday(&start, (struct timezone *)0);
- if (me[i].my_bit == DIST_BIN && RunningAsInit && !Fake) {
+ if (me[i].my_bit == DIST_BASE && RunningAsInit && !Fake) {
unmounted_dev = 1;
unmount("/dev", MNT_FORCE);
} else
@@ -904,7 +904,7 @@ distExtractAll(dialogMenuItem *self)
dialog_clear_norefresh();
/* Only do bin fixup if bin dist was successfully extracted */
- if ((old_dists & DIST_BIN) && !(Dists & DIST_BIN))
+ if ((old_dists & DIST_BASE) && !(Dists & DIST_BASE))
status |= installFixupBin(self);
#ifndef X_AS_PKG
if (old_dists & DIST_XF86)
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index c3b0a26..b81e1a2 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -4,7 +4,7 @@
#define _DIST_H_INCLUDE
/* Bitfields for distributions - hope we never have more than 32! :-) */
-#define DIST_BIN 0x00001
+#define DIST_BASE 0x00001
#define DIST_GAMES 0x00002
#define DIST_MANPAGES 0x00004
#define DIST_PROFLIBS 0x00008
@@ -120,7 +120,7 @@
/* Canned distribution sets */
#define _DIST_USER \
- ( DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO )
+ ( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO )
#define _DIST_DEVELOPER \
( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
diff --git a/usr.sbin/sysinstall/doc.c b/usr.sbin/sysinstall/doc.c
index 9a16d09..c122592 100644
--- a/usr.sbin/sysinstall/doc.c
+++ b/usr.sbin/sysinstall/doc.c
@@ -119,7 +119,7 @@ docShowDocument(dialogMenuItem *self)
}
else {
msgConfirm("Hmmmmm! I can't seem to access the documentation you selected!\n"
- "Have you loaded the bin distribution? Is your network connected?");
+ "Have you loaded the base distribution? Is your network connected?");
return DITEM_FAILURE;
}
}
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index 5b44b79..eccb50da 100644
--- a/usr.sbin/sysinstall/installUpgrade.c
+++ b/usr.sbin/sysinstall/installUpgrade.c
@@ -180,10 +180,10 @@ installUpgrade(dialogMenuItem *self)
if (!dmenuOpenSimple(&MenuDistributions, FALSE) || !Dists)
return DITEM_FAILURE;
}
- else if (!(Dists & DIST_BIN)) { /* No bin selected? Not much of an upgrade.. */
- if (msgYesNo("You didn't select the bin distribution as one of the distributons to load.\n"
+ else if (!(Dists & DIST_BASE)) { /* No base selected? Not much of an upgrade.. */
+ if (msgYesNo("You didn't select the base distribution as one of the distributons to load.\n"
"This one is pretty vital to a successful upgrade. Are you SURE you don't\n"
- "want to select the bin distribution? Chose No to bring up the Distributions\n"
+ "want to select the base distribution? Chose No to bring up the Distributions\n"
"menu again.") != 0) {
if (!dmenuOpenSimple(&MenuDistributions, FALSE))
return DITEM_FAILURE;
@@ -191,7 +191,7 @@ installUpgrade(dialogMenuItem *self)
}
/* Still?! OK! They must know what they're doing.. */
- if (!(Dists & DIST_BIN))
+ if (!(Dists & DIST_BASE))
extractingBin = FALSE;
if (RunningAsInit) {
@@ -325,20 +325,20 @@ media:
msgNotify("Beginning extraction of distributions..");
if (DITEM_STATUS(distExtractAll(self)) == DITEM_FAILURE) {
- msgConfirm("Hmmmm. We couldn't even extract the bin distribution. This upgrade\n"
+ msgConfirm("Hmmmm. We couldn't even extract the base distribution. This upgrade\n"
"should be considered a failure and started from the beginning, sorry!\n"
"The system will reboot now.");
dialog_clear();
systemShutdown(1);
}
else if (Dists) {
- if (!extractingBin || !(Dists & DIST_BIN)) {
+ if (!extractingBin || !(Dists & DIST_BASE)) {
msgNotify("The extraction process seems to have had some problems, but we got most\n"
"of the essentials. We'll treat this as a warning since it may have been\n"
"only non-essential distributions which failed to load.");
}
else {
- msgConfirm("Hmmmm. We couldn't even extract the bin distribution. This upgrade\n"
+ msgConfirm("Hmmmm. We couldn't even extract the base distribution. This upgrade\n"
"should be considered a failure and started from the beginning, sorry!\n"
"The system will reboot now.");
dialog_clear();
@@ -384,7 +384,7 @@ installUpgradeNonInteractive(dialogMenuItem *self)
variable_set2(SYSTEM_STATE, "upgrade", 0);
/* Make sure at least BIN is selected */
- Dists |= DIST_BIN;
+ Dists |= DIST_BASE;
if (RunningAsInit) {
Device **devs;
@@ -470,20 +470,20 @@ installUpgradeNonInteractive(dialogMenuItem *self)
msgNotify("Beginning extraction of distributions..");
if (DITEM_STATUS(distExtractAll(self)) == DITEM_FAILURE) {
- msgConfirm("Hmmmm. We couldn't even extract the bin distribution. This upgrade\n"
+ msgConfirm("Hmmmm. We couldn't even extract the base distribution. This upgrade\n"
"should be considered a failure and started from the beginning, sorry!\n"
"The system will reboot now.");
dialog_clear();
systemShutdown(1);
}
else if (Dists) {
- if (!(Dists & DIST_BIN)) {
+ if (!(Dists & DIST_BASE)) {
msgNotify("The extraction process seems to have had some problems, but we got most\n"
"of the essentials. We'll treat this as a warning since it may have been\n"
"only non-essential distributions which failed to upgrade.");
}
else {
- msgConfirm("Hmmmm. We couldn't even extract the bin distribution. This upgrade\n"
+ msgConfirm("Hmmmm. We couldn't even extract the base distribution. This upgrade\n"
"should be considered a failure and started from the beginning, sorry!\n"
"The system will reboot now.");
dialog_clear();
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 9ff0696..7d97484 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -156,7 +156,7 @@ checkDistXUser(dialogMenuItem *self)
static int
checkDistMinimum(dialogMenuItem *self)
{
- return Dists == (DIST_BIN | DIST_CRYPTO);
+ return Dists == (DIST_BASE | DIST_CRYPTO);
}
static int
@@ -776,7 +776,7 @@ DMenu MenuSubDistributions = {
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
"Select the distributions you wish to install.",
"Please check off the distributions you wish to install. At the\n"
- "very minimum, this should be \"bin\".",
+ "very minimum, this should be \"base\".",
NULL,
NULL,
{ { "X Exit", "Exit this menu (returning to previous)",
@@ -785,8 +785,8 @@ DMenu MenuSubDistributions = {
NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
{ "Reset", "Reset all of the below",
NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
- { " bin", "Binary base distribution (required)",
- dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
+ { " base", "Binary base distribution (required)",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BASE },
#ifdef __i386__
{ " compat1x", "FreeBSD 1.x binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
OpenPOWER on IntegriCloud