Remove the now-unusable ports configuration code. Swapping CDs is bogus.
This commit is contained in:
Jordan K. Hubbard
parent
50019cb3c4
commit
e738250b89
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: cdrom.c,v 1.24 1996/10/09 09:53:25 jkh Exp $
|
||||
* $Id: cdrom.c,v 1.25 1996/10/10 09:22:24 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -52,14 +52,12 @@
|
||||
#undef CD9660
|
||||
|
||||
/*
|
||||
* This isn't static, like the others, since it's often useful to know whether
|
||||
* or not we have a CDROM available in some of the other installation screens.
|
||||
* This also isn't a boolean like the others since we have 3 states for it:
|
||||
* This isn't a boolean like the others since we have 3 states for it:
|
||||
* 0 = cdrom isn't mounted, 1 = cdrom is mounted and we mounted it, 2 = cdrom
|
||||
* was already mounted when we came in and we should leave it that way when
|
||||
* we leave.
|
||||
*/
|
||||
int cdromMounted;
|
||||
static int cdromMounted;
|
||||
|
||||
Boolean
|
||||
mediaInitCDROM(Device *dev)
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: config.c,v 1.49 1996/10/02 10:44:24 jkh Exp $
|
||||
* $Id: config.c,v 1.50 1996/10/03 07:50:08 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -48,8 +48,6 @@
|
||||
static Chunk *chunk_list[MAX_CHUNKS];
|
||||
static int nchunks;
|
||||
|
||||
extern int cdromMounted;
|
||||
|
||||
/* arg to sort */
|
||||
static int
|
||||
chunk_compare(Chunk *c1, Chunk *c2)
|
||||
@ -512,109 +510,6 @@ configPackages(dialogMenuItem *self)
|
||||
return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
|
||||
}
|
||||
|
||||
int
|
||||
configPorts(dialogMenuItem *self)
|
||||
{
|
||||
char *cp, *dist = NULL; /* Shut up compiler */
|
||||
int status = DITEM_SUCCESS, tries = 0;
|
||||
|
||||
if (!variable_get(VAR_PORTS_PATH))
|
||||
variable_set2(VAR_PORTS_PATH, dist = "/cdrom/ports");
|
||||
while (!directory_exists(dist)) {
|
||||
if (++tries > 2) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("You appear to be having some problems with your CD drive\n"
|
||||
"or perhaps cannot find the second CD. This step will now\n"
|
||||
"therefore be skipped.");
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
|
||||
/* Even if we're running multi-user, unmount it for this case */
|
||||
cdromMounted = CD_WE_MOUNTED_IT;
|
||||
mediaDevice->shutdown(mediaDevice);
|
||||
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The ports collection is now on the second CDROM due to\n"
|
||||
"space constraints. Please remove the first CD from the\n"
|
||||
"drive at this time and insert the second CDROM. You will\n"
|
||||
"also need to have the second CDROM in your drive any time\n"
|
||||
"you wish to use the ports collection. When you're ready,\n"
|
||||
"please press [ENTER].");
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Mount failed - either the CDROM isn't in the drive or\n"
|
||||
"you did not allow sufficient time for the drive to become\n"
|
||||
"ready before pressing [ENTER]. Please try again.");
|
||||
}
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
cp = msgGetInput("/usr/ports",
|
||||
"Where would you like to create the link tree?\n"
|
||||
"(press [ENTER] for default location). The link tree should\n"
|
||||
"reside in a directory with as much free space as possible,\n"
|
||||
"as you'll need space to compile any ports.");
|
||||
if (!cp || !*cp) {
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
if (Mkdir(cp)) {
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
if (strcmp(cp, "/usr/ports")) {
|
||||
unlink("/usr/ports");
|
||||
if (symlink(cp, "/usr/ports") == -1) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Unable to create a symlink from /usr/ports to %s!\n"
|
||||
"I can't continue, sorry!", cp);
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("NOTE: This directory is also now symlinked to /usr/ports\n"
|
||||
"which, for a variety of reasons, is the directory the ports\n"
|
||||
"framework expects to find its files in. You should refer to\n"
|
||||
"/usr/ports instead of %s directly when you're working in the\n"
|
||||
"ports collection.", cp);
|
||||
}
|
||||
}
|
||||
dialog_clear_norefresh();
|
||||
msgNotify("Making a link tree from %s to %s.", dist, cp);
|
||||
if (DITEM_STATUS(lndir(dist, cp)) != DITEM_SUCCESS) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The lndir function returned an error status and may not have.\n"
|
||||
"successfully generated the link tree. You may wish to inspect\n"
|
||||
"the /usr/ports directory carefully for any missing link files.");
|
||||
}
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The /usr/ports directory is now ready to use. When the system comes\n"
|
||||
"up fully, you can cd to this directory and type `make' in any sub-\n"
|
||||
"directory for which you'd like to compile a port. You can also\n"
|
||||
"cd to /usr/ports and type `make print-index' for a complete list of all\n"
|
||||
"ports in the hierarchy.");
|
||||
}
|
||||
fixup:
|
||||
tries = 0;
|
||||
while (++tries < 3) {
|
||||
mediaDevice->shutdown(mediaDevice);
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Done with the second CD. Please remove it and reinsert the first\n"
|
||||
"CDROM now. It may be required for subsequence installation steps.\n\n"
|
||||
"When you've done so, please press [ENTER].");
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Mount failed - either the CDROM isn't in the drive or\n"
|
||||
"you did not allow sufficient time for the drive to become\n"
|
||||
"ready before pressing [ENTER]. Please try again.");
|
||||
}
|
||||
}
|
||||
return status | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
/* Load gated package */
|
||||
int
|
||||
configGated(dialogMenuItem *self)
|
||||
|
||||
@ -113,9 +113,8 @@ type:
|
||||
# cd /usr/ports/www/netscape3
|
||||
# make all install
|
||||
|
||||
If you have the Ports collection installed (see the Configuration menu
|
||||
or enable the Ports collection when given the chance to do so during
|
||||
the Novice installation).
|
||||
If you have the Ports collection installed on your machine (usually on
|
||||
the 2nd CDROM of a CDROM release).
|
||||
|
||||
|
||||
Several other non-commercial browsers are also available in
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.132 1996/10/09 09:53:32 jkh Exp $
|
||||
* $Id: install.c,v 1.133 1996/10/12 23:48:33 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -358,7 +358,6 @@ int
|
||||
installNovice(dialogMenuItem *self)
|
||||
{
|
||||
int i;
|
||||
extern int cdromMounted;
|
||||
|
||||
variable_set2(SYSTEM_STATE, "novice");
|
||||
dialog_clear_norefresh();
|
||||
@ -484,16 +483,6 @@ installNovice(dialogMenuItem *self)
|
||||
configXFree86(self);
|
||||
}
|
||||
|
||||
if (cdromMounted) {
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("Would you like to link to the ports tree on your CDROM?\n\n"
|
||||
"This will require that you have your FreeBSD CD in the CDROM\n"
|
||||
"drive to use the ports collection, but at a substantial savings\n"
|
||||
"in disk space (NOTE: This may take as long as 15 or 20 minutes\n"
|
||||
"depending on the speed of your CDROM drive)."))
|
||||
configPorts(self);
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("The FreeBSD package collection is a collection of over 550 ready-to-run\n"
|
||||
"applications, from text editors to games to WEB servers. Would you like\n"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: menus.c,v 1.87 1996/10/10 09:22:37 jkh Exp $
|
||||
* $Id: menus.c,v 1.88 1996/10/12 19:30:23 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -258,7 +258,6 @@ DMenu MenuIndex = {
|
||||
{ "Packages", "The packages collection", NULL, configPackages },
|
||||
{ "Partition", "The disk Partition Editor", NULL, diskPartitionEditor },
|
||||
{ "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
|
||||
{ "Ports", "Link to FreeBSD ports collection.", NULL, configPorts },
|
||||
{ "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "Routed", "Set flags for routed (default: -q)", dmenuVarCheck, configRoutedFlags, NULL, "routed" },
|
||||
{ "Samba", "Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
|
||||
@ -1011,15 +1010,13 @@ software not provided in the base distributions.",
|
||||
NULL, optionsEditor },
|
||||
{ "8 Packages", "Install pre-packaged software for FreeBSD",
|
||||
NULL, configPackages },
|
||||
{ "9 Ports", "Link to FreeBSD Ports Collection on CD",
|
||||
NULL, configPorts },
|
||||
{ "A Root Password", "Set the system manager's password",
|
||||
{ "9 Root Password", "Set the system manager's password",
|
||||
NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "B HTML Docs", "Go to the HTML documentation menu (post-install)",
|
||||
{ "A HTML Docs", "Go to the HTML documentation menu (post-install)",
|
||||
NULL, docBrowser },
|
||||
{ "C XFree86", "Configure XFree86",
|
||||
{ "B XFree86", "Configure XFree86",
|
||||
NULL, configXFree86 },
|
||||
{ "0 Exit", "Exit this menu (returning to previous)",
|
||||
{ "Exit", "Exit this menu (returning to previous)",
|
||||
NULL, dmenuExit },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: sysinstall.h,v 1.80 1996/10/04 13:33:44 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.81 1996/10/05 16:33:03 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -362,7 +362,6 @@ extern void command_func_add(char *key, commandFunc func, void *data);
|
||||
extern int configFstab(void);
|
||||
extern void configSysconfig(char *config);
|
||||
extern void configResolv(void);
|
||||
extern int configPorts(dialogMenuItem *self);
|
||||
extern int configPackages(dialogMenuItem *self);
|
||||
extern int configSaverTimeout(dialogMenuItem *self);
|
||||
extern int configNTP(dialogMenuItem *self);
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: config.c,v 1.49 1996/10/02 10:44:24 jkh Exp $
|
||||
* $Id: config.c,v 1.50 1996/10/03 07:50:08 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -48,8 +48,6 @@
|
||||
static Chunk *chunk_list[MAX_CHUNKS];
|
||||
static int nchunks;
|
||||
|
||||
extern int cdromMounted;
|
||||
|
||||
/* arg to sort */
|
||||
static int
|
||||
chunk_compare(Chunk *c1, Chunk *c2)
|
||||
@ -512,109 +510,6 @@ configPackages(dialogMenuItem *self)
|
||||
return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
|
||||
}
|
||||
|
||||
int
|
||||
configPorts(dialogMenuItem *self)
|
||||
{
|
||||
char *cp, *dist = NULL; /* Shut up compiler */
|
||||
int status = DITEM_SUCCESS, tries = 0;
|
||||
|
||||
if (!variable_get(VAR_PORTS_PATH))
|
||||
variable_set2(VAR_PORTS_PATH, dist = "/cdrom/ports");
|
||||
while (!directory_exists(dist)) {
|
||||
if (++tries > 2) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("You appear to be having some problems with your CD drive\n"
|
||||
"or perhaps cannot find the second CD. This step will now\n"
|
||||
"therefore be skipped.");
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
|
||||
/* Even if we're running multi-user, unmount it for this case */
|
||||
cdromMounted = CD_WE_MOUNTED_IT;
|
||||
mediaDevice->shutdown(mediaDevice);
|
||||
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The ports collection is now on the second CDROM due to\n"
|
||||
"space constraints. Please remove the first CD from the\n"
|
||||
"drive at this time and insert the second CDROM. You will\n"
|
||||
"also need to have the second CDROM in your drive any time\n"
|
||||
"you wish to use the ports collection. When you're ready,\n"
|
||||
"please press [ENTER].");
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Mount failed - either the CDROM isn't in the drive or\n"
|
||||
"you did not allow sufficient time for the drive to become\n"
|
||||
"ready before pressing [ENTER]. Please try again.");
|
||||
}
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
cp = msgGetInput("/usr/ports",
|
||||
"Where would you like to create the link tree?\n"
|
||||
"(press [ENTER] for default location). The link tree should\n"
|
||||
"reside in a directory with as much free space as possible,\n"
|
||||
"as you'll need space to compile any ports.");
|
||||
if (!cp || !*cp) {
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
if (Mkdir(cp)) {
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
if (strcmp(cp, "/usr/ports")) {
|
||||
unlink("/usr/ports");
|
||||
if (symlink(cp, "/usr/ports") == -1) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Unable to create a symlink from /usr/ports to %s!\n"
|
||||
"I can't continue, sorry!", cp);
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("NOTE: This directory is also now symlinked to /usr/ports\n"
|
||||
"which, for a variety of reasons, is the directory the ports\n"
|
||||
"framework expects to find its files in. You should refer to\n"
|
||||
"/usr/ports instead of %s directly when you're working in the\n"
|
||||
"ports collection.", cp);
|
||||
}
|
||||
}
|
||||
dialog_clear_norefresh();
|
||||
msgNotify("Making a link tree from %s to %s.", dist, cp);
|
||||
if (DITEM_STATUS(lndir(dist, cp)) != DITEM_SUCCESS) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The lndir function returned an error status and may not have.\n"
|
||||
"successfully generated the link tree. You may wish to inspect\n"
|
||||
"the /usr/ports directory carefully for any missing link files.");
|
||||
}
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The /usr/ports directory is now ready to use. When the system comes\n"
|
||||
"up fully, you can cd to this directory and type `make' in any sub-\n"
|
||||
"directory for which you'd like to compile a port. You can also\n"
|
||||
"cd to /usr/ports and type `make print-index' for a complete list of all\n"
|
||||
"ports in the hierarchy.");
|
||||
}
|
||||
fixup:
|
||||
tries = 0;
|
||||
while (++tries < 3) {
|
||||
mediaDevice->shutdown(mediaDevice);
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Done with the second CD. Please remove it and reinsert the first\n"
|
||||
"CDROM now. It may be required for subsequence installation steps.\n\n"
|
||||
"When you've done so, please press [ENTER].");
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Mount failed - either the CDROM isn't in the drive or\n"
|
||||
"you did not allow sufficient time for the drive to become\n"
|
||||
"ready before pressing [ENTER]. Please try again.");
|
||||
}
|
||||
}
|
||||
return status | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
/* Load gated package */
|
||||
int
|
||||
configGated(dialogMenuItem *self)
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.132 1996/10/09 09:53:32 jkh Exp $
|
||||
* $Id: install.c,v 1.133 1996/10/12 23:48:33 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -358,7 +358,6 @@ int
|
||||
installNovice(dialogMenuItem *self)
|
||||
{
|
||||
int i;
|
||||
extern int cdromMounted;
|
||||
|
||||
variable_set2(SYSTEM_STATE, "novice");
|
||||
dialog_clear_norefresh();
|
||||
@ -484,16 +483,6 @@ installNovice(dialogMenuItem *self)
|
||||
configXFree86(self);
|
||||
}
|
||||
|
||||
if (cdromMounted) {
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("Would you like to link to the ports tree on your CDROM?\n\n"
|
||||
"This will require that you have your FreeBSD CD in the CDROM\n"
|
||||
"drive to use the ports collection, but at a substantial savings\n"
|
||||
"in disk space (NOTE: This may take as long as 15 or 20 minutes\n"
|
||||
"depending on the speed of your CDROM drive)."))
|
||||
configPorts(self);
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("The FreeBSD package collection is a collection of over 550 ready-to-run\n"
|
||||
"applications, from text editors to games to WEB servers. Would you like\n"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: menus.c,v 1.87 1996/10/10 09:22:37 jkh Exp $
|
||||
* $Id: menus.c,v 1.88 1996/10/12 19:30:23 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -258,7 +258,6 @@ DMenu MenuIndex = {
|
||||
{ "Packages", "The packages collection", NULL, configPackages },
|
||||
{ "Partition", "The disk Partition Editor", NULL, diskPartitionEditor },
|
||||
{ "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
|
||||
{ "Ports", "Link to FreeBSD ports collection.", NULL, configPorts },
|
||||
{ "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "Routed", "Set flags for routed (default: -q)", dmenuVarCheck, configRoutedFlags, NULL, "routed" },
|
||||
{ "Samba", "Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
|
||||
@ -1011,15 +1010,13 @@ software not provided in the base distributions.",
|
||||
NULL, optionsEditor },
|
||||
{ "8 Packages", "Install pre-packaged software for FreeBSD",
|
||||
NULL, configPackages },
|
||||
{ "9 Ports", "Link to FreeBSD Ports Collection on CD",
|
||||
NULL, configPorts },
|
||||
{ "A Root Password", "Set the system manager's password",
|
||||
{ "9 Root Password", "Set the system manager's password",
|
||||
NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "B HTML Docs", "Go to the HTML documentation menu (post-install)",
|
||||
{ "A HTML Docs", "Go to the HTML documentation menu (post-install)",
|
||||
NULL, docBrowser },
|
||||
{ "C XFree86", "Configure XFree86",
|
||||
{ "B XFree86", "Configure XFree86",
|
||||
NULL, configXFree86 },
|
||||
{ "0 Exit", "Exit this menu (returning to previous)",
|
||||
{ "Exit", "Exit this menu (returning to previous)",
|
||||
NULL, dmenuExit },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: sysinstall.h,v 1.80 1996/10/04 13:33:44 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.81 1996/10/05 16:33:03 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -362,7 +362,6 @@ extern void command_func_add(char *key, commandFunc func, void *data);
|
||||
extern int configFstab(void);
|
||||
extern void configSysconfig(char *config);
|
||||
extern void configResolv(void);
|
||||
extern int configPorts(dialogMenuItem *self);
|
||||
extern int configPackages(dialogMenuItem *self);
|
||||
extern int configSaverTimeout(dialogMenuItem *self);
|
||||
extern int configNTP(dialogMenuItem *self);
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: cdrom.c,v 1.24 1996/10/09 09:53:25 jkh Exp $
|
||||
* $Id: cdrom.c,v 1.25 1996/10/10 09:22:24 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -52,14 +52,12 @@
|
||||
#undef CD9660
|
||||
|
||||
/*
|
||||
* This isn't static, like the others, since it's often useful to know whether
|
||||
* or not we have a CDROM available in some of the other installation screens.
|
||||
* This also isn't a boolean like the others since we have 3 states for it:
|
||||
* This isn't a boolean like the others since we have 3 states for it:
|
||||
* 0 = cdrom isn't mounted, 1 = cdrom is mounted and we mounted it, 2 = cdrom
|
||||
* was already mounted when we came in and we should leave it that way when
|
||||
* we leave.
|
||||
*/
|
||||
int cdromMounted;
|
||||
static int cdromMounted;
|
||||
|
||||
Boolean
|
||||
mediaInitCDROM(Device *dev)
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: config.c,v 1.49 1996/10/02 10:44:24 jkh Exp $
|
||||
* $Id: config.c,v 1.50 1996/10/03 07:50:08 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -48,8 +48,6 @@
|
||||
static Chunk *chunk_list[MAX_CHUNKS];
|
||||
static int nchunks;
|
||||
|
||||
extern int cdromMounted;
|
||||
|
||||
/* arg to sort */
|
||||
static int
|
||||
chunk_compare(Chunk *c1, Chunk *c2)
|
||||
@ -512,109 +510,6 @@ configPackages(dialogMenuItem *self)
|
||||
return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
|
||||
}
|
||||
|
||||
int
|
||||
configPorts(dialogMenuItem *self)
|
||||
{
|
||||
char *cp, *dist = NULL; /* Shut up compiler */
|
||||
int status = DITEM_SUCCESS, tries = 0;
|
||||
|
||||
if (!variable_get(VAR_PORTS_PATH))
|
||||
variable_set2(VAR_PORTS_PATH, dist = "/cdrom/ports");
|
||||
while (!directory_exists(dist)) {
|
||||
if (++tries > 2) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("You appear to be having some problems with your CD drive\n"
|
||||
"or perhaps cannot find the second CD. This step will now\n"
|
||||
"therefore be skipped.");
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
|
||||
/* Even if we're running multi-user, unmount it for this case */
|
||||
cdromMounted = CD_WE_MOUNTED_IT;
|
||||
mediaDevice->shutdown(mediaDevice);
|
||||
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The ports collection is now on the second CDROM due to\n"
|
||||
"space constraints. Please remove the first CD from the\n"
|
||||
"drive at this time and insert the second CDROM. You will\n"
|
||||
"also need to have the second CDROM in your drive any time\n"
|
||||
"you wish to use the ports collection. When you're ready,\n"
|
||||
"please press [ENTER].");
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Mount failed - either the CDROM isn't in the drive or\n"
|
||||
"you did not allow sufficient time for the drive to become\n"
|
||||
"ready before pressing [ENTER]. Please try again.");
|
||||
}
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
cp = msgGetInput("/usr/ports",
|
||||
"Where would you like to create the link tree?\n"
|
||||
"(press [ENTER] for default location). The link tree should\n"
|
||||
"reside in a directory with as much free space as possible,\n"
|
||||
"as you'll need space to compile any ports.");
|
||||
if (!cp || !*cp) {
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
if (Mkdir(cp)) {
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
if (strcmp(cp, "/usr/ports")) {
|
||||
unlink("/usr/ports");
|
||||
if (symlink(cp, "/usr/ports") == -1) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Unable to create a symlink from /usr/ports to %s!\n"
|
||||
"I can't continue, sorry!", cp);
|
||||
status = DITEM_FAILURE;
|
||||
goto fixup;
|
||||
}
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("NOTE: This directory is also now symlinked to /usr/ports\n"
|
||||
"which, for a variety of reasons, is the directory the ports\n"
|
||||
"framework expects to find its files in. You should refer to\n"
|
||||
"/usr/ports instead of %s directly when you're working in the\n"
|
||||
"ports collection.", cp);
|
||||
}
|
||||
}
|
||||
dialog_clear_norefresh();
|
||||
msgNotify("Making a link tree from %s to %s.", dist, cp);
|
||||
if (DITEM_STATUS(lndir(dist, cp)) != DITEM_SUCCESS) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The lndir function returned an error status and may not have.\n"
|
||||
"successfully generated the link tree. You may wish to inspect\n"
|
||||
"the /usr/ports directory carefully for any missing link files.");
|
||||
}
|
||||
else {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("The /usr/ports directory is now ready to use. When the system comes\n"
|
||||
"up fully, you can cd to this directory and type `make' in any sub-\n"
|
||||
"directory for which you'd like to compile a port. You can also\n"
|
||||
"cd to /usr/ports and type `make print-index' for a complete list of all\n"
|
||||
"ports in the hierarchy.");
|
||||
}
|
||||
fixup:
|
||||
tries = 0;
|
||||
while (++tries < 3) {
|
||||
mediaDevice->shutdown(mediaDevice);
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Done with the second CD. Please remove it and reinsert the first\n"
|
||||
"CDROM now. It may be required for subsequence installation steps.\n\n"
|
||||
"When you've done so, please press [ENTER].");
|
||||
if (!mediaDevice->init(mediaDevice)) {
|
||||
dialog_clear_norefresh();
|
||||
msgConfirm("Mount failed - either the CDROM isn't in the drive or\n"
|
||||
"you did not allow sufficient time for the drive to become\n"
|
||||
"ready before pressing [ENTER]. Please try again.");
|
||||
}
|
||||
}
|
||||
return status | DITEM_RESTORE;
|
||||
}
|
||||
|
||||
/* Load gated package */
|
||||
int
|
||||
configGated(dialogMenuItem *self)
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.132 1996/10/09 09:53:32 jkh Exp $
|
||||
* $Id: install.c,v 1.133 1996/10/12 23:48:33 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -358,7 +358,6 @@ int
|
||||
installNovice(dialogMenuItem *self)
|
||||
{
|
||||
int i;
|
||||
extern int cdromMounted;
|
||||
|
||||
variable_set2(SYSTEM_STATE, "novice");
|
||||
dialog_clear_norefresh();
|
||||
@ -484,16 +483,6 @@ installNovice(dialogMenuItem *self)
|
||||
configXFree86(self);
|
||||
}
|
||||
|
||||
if (cdromMounted) {
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("Would you like to link to the ports tree on your CDROM?\n\n"
|
||||
"This will require that you have your FreeBSD CD in the CDROM\n"
|
||||
"drive to use the ports collection, but at a substantial savings\n"
|
||||
"in disk space (NOTE: This may take as long as 15 or 20 minutes\n"
|
||||
"depending on the speed of your CDROM drive)."))
|
||||
configPorts(self);
|
||||
}
|
||||
|
||||
dialog_clear_norefresh();
|
||||
if (!msgYesNo("The FreeBSD package collection is a collection of over 550 ready-to-run\n"
|
||||
"applications, from text editors to games to WEB servers. Would you like\n"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: menus.c,v 1.87 1996/10/10 09:22:37 jkh Exp $
|
||||
* $Id: menus.c,v 1.88 1996/10/12 19:30:23 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -258,7 +258,6 @@ DMenu MenuIndex = {
|
||||
{ "Packages", "The packages collection", NULL, configPackages },
|
||||
{ "Partition", "The disk Partition Editor", NULL, diskPartitionEditor },
|
||||
{ "PCNFSD", "Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
|
||||
{ "Ports", "Link to FreeBSD ports collection.", NULL, configPorts },
|
||||
{ "Root Password", "Set the system manager's password.", NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "Routed", "Set flags for routed (default: -q)", dmenuVarCheck, configRoutedFlags, NULL, "routed" },
|
||||
{ "Samba", "Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
|
||||
@ -1011,15 +1010,13 @@ software not provided in the base distributions.",
|
||||
NULL, optionsEditor },
|
||||
{ "8 Packages", "Install pre-packaged software for FreeBSD",
|
||||
NULL, configPackages },
|
||||
{ "9 Ports", "Link to FreeBSD Ports Collection on CD",
|
||||
NULL, configPorts },
|
||||
{ "A Root Password", "Set the system manager's password",
|
||||
{ "9 Root Password", "Set the system manager's password",
|
||||
NULL, dmenuSystemCommand, NULL, "passwd root" },
|
||||
{ "B HTML Docs", "Go to the HTML documentation menu (post-install)",
|
||||
{ "A HTML Docs", "Go to the HTML documentation menu (post-install)",
|
||||
NULL, docBrowser },
|
||||
{ "C XFree86", "Configure XFree86",
|
||||
{ "B XFree86", "Configure XFree86",
|
||||
NULL, configXFree86 },
|
||||
{ "0 Exit", "Exit this menu (returning to previous)",
|
||||
{ "Exit", "Exit this menu (returning to previous)",
|
||||
NULL, dmenuExit },
|
||||
{ NULL } },
|
||||
};
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: sysinstall.h,v 1.80 1996/10/04 13:33:44 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.81 1996/10/05 16:33:03 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -362,7 +362,6 @@ extern void command_func_add(char *key, commandFunc func, void *data);
|
||||
extern int configFstab(void);
|
||||
extern void configSysconfig(char *config);
|
||||
extern void configResolv(void);
|
||||
extern int configPorts(dialogMenuItem *self);
|
||||
extern int configPackages(dialogMenuItem *self);
|
||||
extern int configSaverTimeout(dialogMenuItem *self);
|
||||
extern int configNTP(dialogMenuItem *self);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user