d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't call it a Novice install, call it Standard.

Browse Source 
Also say thousands of packages, not hundreds.
This commit is contained in:
jkh 2000-02-18 07:09:45 +00:00
parent 6eb112416e
commit 398d3f2df8
15 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/sysinstall/dispatch.c
View File

@ -81,7 +81,7 @@ static struct _word {
{ "docShowDocument", docShowDocument },
{ "installCommit", installCommit },
{ "installExpress", installExpress },
{ "installNovice", installNovice },
{ "installStandard", installStandard },
{ "installUpgrade", installUpgrade },
{ "installFixupBin", installFixupBin },
{ "installFixupXFree", installFixupXFree },

9
release/sysinstall/install.c
View File

@ -459,14 +459,14 @@ installExpress(dialogMenuItem *self)
return i;
}
/* Novice mode installation */
/* Standard mode installation */
int
installNovice(dialogMenuItem *self)
installStandard(dialogMenuItem *self)
{
int i, tries = 0;
Device **devs;
variable_set2(SYSTEM_STATE, "novice", 0);
variable_set2(SYSTEM_STATE, "standard", 0);
dialog_clear_norefresh();
#ifndef __alpha__
msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n"
@ -579,7 +579,7 @@ installNovice(dialogMenuItem *self)
}
dialog_clear_norefresh();
if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
if (!msgYesNo("The FreeBSD package collection is a collection of thousands of ready-to-run\n"
"applications, from text editors to games to WEB servers and more. Would you\n"
"like to browse the collection now?")) {
(void)configPackages(self);
@ -1050,6 +1050,7 @@ installVarDefaults(dialogMenuItem *self)
else
variable_set2(SYSTEM_STATE, "init", 0);
variable_set2(VAR_NEWFS_ARGS, "-b 8192 -f 1024", 0);
variable_set2(VAR_MOUSED_PORT, "/dev/psm0", 0);
return DITEM_SUCCESS;
}

4
release/sysinstall/menus.c
View File

@ -277,7 +277,7 @@ DMenu MenuIndex = {
{ " FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP },
{ " Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
{ " HTML Docs", "The HTML documentation menu", NULL, docBrowser },
{ " Install, Novice", "A novice system installation.", NULL, installNovice },
{ " Install, Standard", "A standard system installation.", NULL, installStandard },
{ " Install, Express", "An express system installation.", NULL, installExpress },
{ " Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ " Label", "The disk Label editor", NULL, diskLabelEditor },
@ -333,7 +333,7 @@ DMenu MenuInitial = {
{ { "Select" },
{ "X Exit Install", NULL, NULL, dmenuExit },
{ " Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" },
{ "Novice", "Begin a novice installation (for beginners)", NULL, installNovice },
{ "Standard", "Begin a standard installation (recommended)", NULL, installStandard },
{ "Express", "Begin a quick installation (for the impatient)", NULL, installExpress },
{ " Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ "Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure },

4
release/sysinstall/sysinstall.8
View File

@ -614,8 +614,8 @@ Start an "express" installation, asking few questions of
the user.
.Pp
\fBVariables:\fR None
.It installNovice
Start a "novice" installation, the most user-friendly
.It installStandard
Start a "standard" installation, the most user-friendly
installation type available.
.Pp
\fBVariables:\fR None

2
release/sysinstall/sysinstall.h
View File

@ -558,7 +558,7 @@ extern Boolean checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **u
extern int installCommit(dialogMenuItem *self);
extern int installCustomCommit(dialogMenuItem *self);
extern int installExpress(dialogMenuItem *self);
extern int installNovice(dialogMenuItem *self);
extern int installStandard(dialogMenuItem *self);
extern int installFixitHoloShell(dialogMenuItem *self);
extern int installFixitCDROM(dialogMenuItem *self);
extern int installFixitFloppy(dialogMenuItem *self);

2
usr.sbin/sade/dispatch.c
View File

@ -81,7 +81,7 @@ static struct _word {
{ "docShowDocument", docShowDocument },
{ "installCommit", installCommit },
{ "installExpress", installExpress },
{ "installNovice", installNovice },
{ "installStandard", installStandard },
{ "installUpgrade", installUpgrade },
{ "installFixupBin", installFixupBin },
{ "installFixupXFree", installFixupXFree },

9
usr.sbin/sade/install.c
View File

@ -459,14 +459,14 @@ installExpress(dialogMenuItem *self)
return i;
}
/* Novice mode installation */
/* Standard mode installation */
int
installNovice(dialogMenuItem *self)
installStandard(dialogMenuItem *self)
{
int i, tries = 0;
Device **devs;
variable_set2(SYSTEM_STATE, "novice", 0);
variable_set2(SYSTEM_STATE, "standard", 0);
dialog_clear_norefresh();
#ifndef __alpha__
msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n"
@ -579,7 +579,7 @@ installNovice(dialogMenuItem *self)
}
dialog_clear_norefresh();
if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
if (!msgYesNo("The FreeBSD package collection is a collection of thousands of ready-to-run\n"
"applications, from text editors to games to WEB servers and more. Would you\n"
"like to browse the collection now?")) {
(void)configPackages(self);
@ -1050,6 +1050,7 @@ installVarDefaults(dialogMenuItem *self)
else
variable_set2(SYSTEM_STATE, "init", 0);
variable_set2(VAR_NEWFS_ARGS, "-b 8192 -f 1024", 0);
variable_set2(VAR_MOUSED_PORT, "/dev/psm0", 0);
return DITEM_SUCCESS;
}

4
usr.sbin/sade/menus.c
View File

@ -277,7 +277,7 @@ DMenu MenuIndex = {
{ " FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP },
{ " Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
{ " HTML Docs", "The HTML documentation menu", NULL, docBrowser },
{ " Install, Novice", "A novice system installation.", NULL, installNovice },
{ " Install, Standard", "A standard system installation.", NULL, installStandard },
{ " Install, Express", "An express system installation.", NULL, installExpress },
{ " Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ " Label", "The disk Label editor", NULL, diskLabelEditor },
@ -333,7 +333,7 @@ DMenu MenuInitial = {
{ { "Select" },
{ "X Exit Install", NULL, NULL, dmenuExit },
{ " Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" },
{ "Novice", "Begin a novice installation (for beginners)", NULL, installNovice },
{ "Standard", "Begin a standard installation (recommended)", NULL, installStandard },
{ "Express", "Begin a quick installation (for the impatient)", NULL, installExpress },
{ " Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ "Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure },

4
usr.sbin/sade/sade.8
View File

@ -614,8 +614,8 @@ Start an "express" installation, asking few questions of
the user.
.Pp
\fBVariables:\fR None
.It installNovice
Start a "novice" installation, the most user-friendly
.It installStandard
Start a "standard" installation, the most user-friendly
installation type available.
.Pp
\fBVariables:\fR None

2
usr.sbin/sade/sade.h
View File

@ -558,7 +558,7 @@ extern Boolean checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **u
extern int installCommit(dialogMenuItem *self);
extern int installCustomCommit(dialogMenuItem *self);
extern int installExpress(dialogMenuItem *self);
extern int installNovice(dialogMenuItem *self);
extern int installStandard(dialogMenuItem *self);
extern int installFixitHoloShell(dialogMenuItem *self);
extern int installFixitCDROM(dialogMenuItem *self);
extern int installFixitFloppy(dialogMenuItem *self);

2
usr.sbin/sysinstall/dispatch.c
View File

@ -81,7 +81,7 @@ static struct _word {
{ "docShowDocument", docShowDocument },
{ "installCommit", installCommit },
{ "installExpress", installExpress },
{ "installNovice", installNovice },
{ "installStandard", installStandard },
{ "installUpgrade", installUpgrade },
{ "installFixupBin", installFixupBin },
{ "installFixupXFree", installFixupXFree },

9
usr.sbin/sysinstall/install.c
View File

@ -459,14 +459,14 @@ installExpress(dialogMenuItem *self)
return i;
}
/* Novice mode installation */
/* Standard mode installation */
int
installNovice(dialogMenuItem *self)
installStandard(dialogMenuItem *self)
{
int i, tries = 0;
Device **devs;
variable_set2(SYSTEM_STATE, "novice", 0);
variable_set2(SYSTEM_STATE, "standard", 0);
dialog_clear_norefresh();
#ifndef __alpha__
msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n"
@ -579,7 +579,7 @@ installNovice(dialogMenuItem *self)
}
dialog_clear_norefresh();
if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
if (!msgYesNo("The FreeBSD package collection is a collection of thousands of ready-to-run\n"
"applications, from text editors to games to WEB servers and more. Would you\n"
"like to browse the collection now?")) {
(void)configPackages(self);
@ -1050,6 +1050,7 @@ installVarDefaults(dialogMenuItem *self)
else
variable_set2(SYSTEM_STATE, "init", 0);
variable_set2(VAR_NEWFS_ARGS, "-b 8192 -f 1024", 0);
variable_set2(VAR_MOUSED_PORT, "/dev/psm0", 0);
return DITEM_SUCCESS;
}

4
usr.sbin/sysinstall/menus.c
View File

@ -277,7 +277,7 @@ DMenu MenuIndex = {
{ " FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP },
{ " Gateway", "Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
{ " HTML Docs", "The HTML documentation menu", NULL, docBrowser },
{ " Install, Novice", "A novice system installation.", NULL, installNovice },
{ " Install, Standard", "A standard system installation.", NULL, installStandard },
{ " Install, Express", "An express system installation.", NULL, installExpress },
{ " Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ " Label", "The disk Label editor", NULL, diskLabelEditor },
@ -333,7 +333,7 @@ DMenu MenuInitial = {
{ { "Select" },
{ "X Exit Install", NULL, NULL, dmenuExit },
{ " Usage", "Quick start - How to use this menu system", NULL, dmenuDisplayFile, NULL, "usage" },
{ "Novice", "Begin a novice installation (for beginners)", NULL, installNovice },
{ "Standard", "Begin a standard installation (recommended)", NULL, installStandard },
{ "Express", "Begin a quick installation (for the impatient)", NULL, installExpress },
{ " Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ "Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure },

4
usr.sbin/sysinstall/sysinstall.8
View File

@ -614,8 +614,8 @@ Start an "express" installation, asking few questions of
the user.
.Pp
\fBVariables:\fR None
.It installNovice
Start a "novice" installation, the most user-friendly
.It installStandard
Start a "standard" installation, the most user-friendly
installation type available.
.Pp
\fBVariables:\fR None

2
usr.sbin/sysinstall/sysinstall.h
View File

@ -558,7 +558,7 @@ extern Boolean checkLabels(Boolean whinge, Chunk **rdev, Chunk **sdev, Chunk **u
extern int installCommit(dialogMenuItem *self);
extern int installCustomCommit(dialogMenuItem *self);
extern int installExpress(dialogMenuItem *self);
extern int installNovice(dialogMenuItem *self);
extern int installStandard(dialogMenuItem *self);
extern int installFixitHoloShell(dialogMenuItem *self);
extern int installFixitCDROM(dialogMenuItem *self);
extern int installFixitFloppy(dialogMenuItem *self);