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

o Fix installUpgrade to start the holographic shell as well.

Browse Source 
o  Lots of documentation fixes.
o  Rename FTP active to "FTP" and explain passive mode better.
o  Make tcpip screen a bit more friendly.
o  Literally dozens of nits.
This commit is contained in:
Jordan K. Hubbard 1995-10-26 08:11:24 +00:00
parent 0d9a79f8a6
commit 4ea85d4592
8 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
release/sysinstall/apache.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: apache.c,v 1.2 1995/10/22 21:38:04 jkh Exp $
* $Id: apache.c,v 1.3 1995/10/22 23:20:44 jkh Exp $
*
* Copyright (c) 1995
* Coranth Gryphon. All rights reserved.
@ -54,7 +54,7 @@
#include "sysinstall.h"
#define APACHE_BASE "/usr/local/www"
#define APACHE_HELPFILE "apache.html"
#define APACHE_HELPFILE "apache.hlp"
#define APACHE_PACKAGE "apache-0.8.14"
typedef struct
@ -393,12 +393,19 @@ installApache(char *unused)
char *tptr;
FILE *fptr;
msgConfirm("Since you elected to install the WEB server, we'll now add the\n"
"Apache HTTPD package and set up a few configuration files.");
i = package_add(APACHE_PACKAGE);
if (i == RET_SUCCESS)
i = apacheOpenDialog();
if (i != RET_SUCCESS)
if (i != RET_SUCCESS) {
msgConfirm("Hmmmmm. Looks like we weren't able to fetch the Apache WEB server\n"
"package. You may wish to fetch and configure it by hand by looking\n"
"in /usr/ports/net/apache (in the ports collection) or looking for the\n"
"precompiled apache package in packages/networking/%s.", APACHE_PACKAGE);
return (i);
}
/*** Fix defaults for invalid value ***/
maxcon = atoi(tconf.maxcon);

8
release/sysinstall/installFinal.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installFinal.c,v 1.9 1995/10/22 21:38:10 jkh Exp $
* $Id: installFinal.c,v 1.10 1995/10/23 13:19:41 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard & Coranth Gryphon. All rights reserved.
@ -94,7 +94,7 @@ installNetworking(char *unused)
/* Set up anonymous FTP access to this machine? */
if (variable_get("anon_ftp")) {
tptr = msgGetInput("/u", "What directory should the ftp home be in?");
tptr = msgGetInput("/u", "What directory should the anonymous ftp's home be under?");
if (tptr && *tptr && (tptr[0] == '/')) {
int len = strlen(tbuf);
@ -230,8 +230,10 @@ installNetworking(char *unused)
"the /etc/exports file. You must configure this information before\n"
"other hosts will be able to mount file systems from your machine.\n"
"Press [ENTER] now to invoke an editor on /etc/exports");
vsystem("echo '#The following example exports /usr to 3 machines named after ducks.' > /etc/exports");
vsystem("echo '#The following example exports /usr to 3 machines named after ducks:' > /etc/exports");
vsystem("echo '#/usr huey louie dewie' >> /etc/exports");
vsystem("echo '#' >> /etc/exports");
vsystem("echo '# You should replace these lines with your actual exported filesystems.' >> /etc/exports");
vsystem("echo >> /etc/exports");
systemExecute("ee /etc/exports");
}

3
release/sysinstall/installUpgrade.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.8 1995/10/23 13:19:45 jkh Exp $
* $Id: installUpgrade.c,v 1.9 1995/10/24 02:18:06 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -260,6 +260,7 @@ installUpgrade(char *str)
return RET_FAIL;
}
chdir("/");
systemCreateHoloshell();
if (extractingBin) {
while (!saved_etc) {
saved_etc = msgGetInput("/usr/tmp/etc", "Under which directory do you wish to save your current /etc?");

4
release/sysinstall/options.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: options.c,v 1.22 1995/10/21 18:28:07 jkh Exp $
* $Id: options.c,v 1.23 1995/10/22 01:32:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -117,6 +117,8 @@ static Option Options[] = {
OPT_IS_VAR, NULL, VAR_NO_CONFIRM, varCheck },
{ "FTP OnError", "What to do when FTP requests fail: abort, retry, reselect.",
OPT_IS_FUNC, mediaSetFtpOnError, VAR_FTP_ONERROR, varCheck },
{ "FTP Retries", "If FTP OnError == retry, this is the number of times to try.",
OPT_IS_VAR, NULL, VAR_FTP_RETRIES, varCheck },
{ "FTP username", "Username and password to use instead of anonymous",
OPT_IS_FUNC, mediaSetFtpUserPass, VAR_FTP_USER, varCheck },
{ "Tape Blocksize", "Tape media block size in 512 byte blocks",

6
release/sysinstall/package.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: package.c,v 1.17 1995/10/23 13:19:49 jkh Exp $
* $Id: package.c,v 1.18 1995/10/24 02:18:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -138,11 +138,11 @@ package_extract(Device *dev, char *name)
msgDebug("pkg_extract: get operation returned %d\n", fd);
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Unable to fetch package %s from selected media.\n"
"No package add will be done.");
"No package add will be done.", name);
else {
dialog_clear();
msgConfirm("Unable to fetch package %s from selected media.\n"
"No package add will be done.");
"No package add will be done.", name);
}
}
return ret;

3
usr.sbin/sysinstall/installUpgrade.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.8 1995/10/23 13:19:45 jkh Exp $
* $Id: installUpgrade.c,v 1.9 1995/10/24 02:18:06 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -260,6 +260,7 @@ installUpgrade(char *str)
return RET_FAIL;
}
chdir("/");
systemCreateHoloshell();
if (extractingBin) {
while (!saved_etc) {
saved_etc = msgGetInput("/usr/tmp/etc", "Under which directory do you wish to save your current /etc?");

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

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: options.c,v 1.22 1995/10/21 18:28:07 jkh Exp $
* $Id: options.c,v 1.23 1995/10/22 01:32:57 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -117,6 +117,8 @@ static Option Options[] = {
OPT_IS_VAR, NULL, VAR_NO_CONFIRM, varCheck },
{ "FTP OnError", "What to do when FTP requests fail: abort, retry, reselect.",
OPT_IS_FUNC, mediaSetFtpOnError, VAR_FTP_ONERROR, varCheck },
{ "FTP Retries", "If FTP OnError == retry, this is the number of times to try.",
OPT_IS_VAR, NULL, VAR_FTP_RETRIES, varCheck },
{ "FTP username", "Username and password to use instead of anonymous",
OPT_IS_FUNC, mediaSetFtpUserPass, VAR_FTP_USER, varCheck },
{ "Tape Blocksize", "Tape media block size in 512 byte blocks",

6
usr.sbin/sysinstall/package.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: package.c,v 1.17 1995/10/23 13:19:49 jkh Exp $
* $Id: package.c,v 1.18 1995/10/24 02:18:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -138,11 +138,11 @@ package_extract(Device *dev, char *name)
msgDebug("pkg_extract: get operation returned %d\n", fd);
if (variable_get(VAR_NO_CONFIRM))
msgNotify("Unable to fetch package %s from selected media.\n"
"No package add will be done.");
"No package add will be done.", name);
else {
dialog_clear();
msgConfirm("Unable to fetch package %s from selected media.\n"
"No package add will be done.");
"No package add will be done.", name);
}
}
return ret;