diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2002-04-23 22:16:41 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2002-04-23 22:16:41 +0000 |
commit | 01df2ec3284983bfe28031d1c86c13ffd4a21b7e (patch) | |
tree | 3eee8dd61f995528c0a9e5d0ffb9521208186643 /usr.sbin | |
parent | 046eb0421efae11e9abc90815592fe370c77c8e6 (diff) | |
download | src-01df2ec3284983bfe28031d1c86c13ffd4a21b7e.tar.gz src-01df2ec3284983bfe28031d1c86c13ffd4a21b7e.zip |
Change the name of the 'bin' distribution to 'base'.
This is done since it contains much more than /bin, and also gets in the
way when making a combined install+fixit CD.
OK'ed by: jkh
Notes
Notes:
svn path=/head/; revision=95327
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/menus.c | 8 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dist.c | 8 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dist.h | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/doc.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/installUpgrade.c | 22 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 8 |
6 files changed, 26 insertions, 26 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 9ff06961cd21..7d97484fb177 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 7c94073d5dbe..722fe67dd47d 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 c3b0a26ac226..b81e1a21cf3c 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 9a16d094ecc8..c1225924aa69 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 5b44b79094f8..eccb50da0542 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 9ff06961cd21..7d97484fb177 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 }, |