diff options
Diffstat (limited to 'release/sysinstall')
55 files changed, 507 insertions, 137 deletions
diff --git a/release/sysinstall/anonFTP.c b/release/sysinstall/anonFTP.c index 2b386f8d1e50..8a54ec319ace 100644 --- a/release/sysinstall/anonFTP.c +++ b/release/sysinstall/anonFTP.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: anonFTP.c,v 1.17.2.2 1997/01/15 04:49:59 jkh Exp $ + * $Id: anonFTP.c,v 1.17.2.3 1997/03/09 22:37:47 jkh Exp $ * * Copyright (c) 1995 * Coranth Gryphon. All rights reserved. @@ -168,7 +168,7 @@ createFtpUser(void) return DITEM_SUCCESS; /* succeeds if already exists */ } - sprintf(pwline, "%s::%s:%d::0:0:%s:%s:/bin/date\n", FTP_NAME, tconf.uid, gid, tconf.comment, tconf.homedir); + sprintf(pwline, "%s:*:%s:%d::0:0:%s:%s:/nonexistent\n", FTP_NAME, tconf.uid, gid, tconf.comment, tconf.homedir); fptr = fopen(_PATH_MASTERPASSWD,"a"); if (! fptr) { diff --git a/release/sysinstall/anonFTP.c.orig b/release/sysinstall/anonFTP.c.orig new file mode 100644 index 000000000000..83afbc9c2d6e --- /dev/null +++ b/release/sysinstall/anonFTP.c.orig @@ -0,0 +1,316 @@ +/* + * The new sysinstall program. + * + * This is probably the last program in the `sysinstall' line - the next + * generation being essentially a complete rewrite. + * + * $Id: anonFTP.c,v 1.17.2.3 1997/03/09 22:37:47 jkh Exp $ + * + * Copyright (c) 1995 + * Coranth Gryphon. All rights reserved. + * Copyright (c) 1996 + * Jordan K. Hubbard. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this + * point in the file. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR THEIR PETS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include "sysinstall.h" +#include <sys/param.h> +#include <pwd.h> +#include <grp.h> + +/* This doesn't change until FTP itself changes */ + +#define FTP_NAME "ftp" +#define MOTD_FILE "ftpmotd" + +/* These change if we want to use different defaults */ + +#define FTP_UID 14 +#define FTP_GID 5 +#define FTP_GROUP "operator" +#define FTP_UPLOAD "incoming" +#define FTP_COMMENT "Anonymous FTP Admin" +#define FTP_HOMEDIR "/var/ftp" + +#define ANONFTP_HELPFILE "anonftp" + +/* Set up the structure to hold configuration information */ +/* Note that this is only what we could fit onto the one screen */ + +typedef struct +{ + char homedir[64]; /* Home Dir for Anon FTP */ + char group[32]; /* Group */ + char uid[8]; /* UID */ + char comment[64]; /* PWD Comment */ + char upload[32]; /* Upload Dir */ +} FTPConf; + +static FTPConf tconf; + +#define ANONFTP_HOMEDIR_LEN 64 +#define ANONFTP_COMMENT_LEN 64 +#define ANONFTP_UPLOAD_LEN 32 +#define ANONFTP_GROUP_LEN 32 +#define ANONFTP_UID_LEN 8 + +static int okbutton, cancelbutton; + +/* What the screen size is meant to be */ +#define ANONFTP_DIALOG_Y 0 +#define ANONFTP_DIALOG_X 8 +#define ANONFTP_DIALOG_WIDTH COLS - 16 +#define ANONFTP_DIALOG_HEIGHT LINES - 2 + +static Layout layout[] = { +#define LAYOUT_UID 0 + { 2, 3, 8, ANONFTP_UID_LEN - 1, + "UID:", "What user ID to assign to FTP Admin", + tconf.uid, STRINGOBJ, NULL }, +#define LAYOUT_GROUP 1 + { 2, 15, 15, ANONFTP_GROUP_LEN - 1, + "Group:", "Group name that ftp process belongs to", + tconf.group, STRINGOBJ, NULL }, +#define LAYOUT_COMMENT 2 + { 2, 35, 24, ANONFTP_COMMENT_LEN - 1, + "Comment:", "Password file comment for FTP Admin", + tconf.comment, STRINGOBJ, NULL }, +#define LAYOUT_HOMEDIR 3 + { 9, 10, 43, ANONFTP_HOMEDIR_LEN - 1, + "FTP Root Directory:", + "The top directory to chroot to when doing anonymous ftp", + tconf.homedir, STRINGOBJ, NULL }, +#define LAYOUT_UPLOAD 4 + { 14, 20, 22, ANONFTP_UPLOAD_LEN - 1, + "Upload Subdirectory:", "Designated sub-directory that holds uploads", + tconf.upload, STRINGOBJ, NULL }, +#define LAYOUT_OKBUTTON 5 + { 19, 15, 0, 0, + "OK", "Select this if you are happy with these settings", + &okbutton, BUTTONOBJ, NULL }, +#define LAYOUT_CANCELBUTTON 6 + { 19, 35, 0, 0, + "CANCEL", "Select this if you wish to cancel this screen", + &cancelbutton, BUTTONOBJ, NULL }, + { NULL }, +}; + +int +createFtpUser(void) +{ + struct passwd *tpw; + struct group *tgrp; + char pwline[256]; + char *tptr; + int gid; + FILE *fptr; + + if ((gid = atoi(tconf.group)) <= 0) { + if (!(tgrp = getgrnam(tconf.group))) { + /* group does not exist, create it by name */ + + tptr = msgGetInput("14", "What group ID to use for group %s ?", tconf.group); + if (tptr && *tptr && ((gid = atoi(tptr)) > 0)) { + if ((fptr = fopen(_PATH_GROUP,"a"))) { + fprintf(fptr,"%s:*:%d:%s\n",tconf.group,gid,FTP_NAME); + fclose(fptr); + } + } + else + gid = FTP_GID; + } + else + gid = tgrp->gr_gid; + } + else if (!getgrgid(gid)) { + /* group does not exist, create it by number */ + + tptr = msgGetInput("14", "What group name to use for gid %d ?", gid); + if (tptr && *tptr) { + SAFE_STRCPY(tconf.group, tptr); + if ((tgrp = getgrnam(tconf.group))) { + gid = tgrp->gr_gid; + } + else if ((fptr = fopen(_PATH_GROUP,"a"))) { + fprintf(fptr,"%s:*:%d:%s\n",tconf.group,gid,FTP_NAME); + fclose(fptr); + } + } + } + + if ((tpw = getpwnam(FTP_NAME))) { + if (tpw->pw_uid != FTP_UID) + msgConfirm("FTP user already exists with a different uid."); + + return DITEM_SUCCESS; /* succeeds if already exists */ + } + + sprintf(pwline, "%s::%s:%d::0:0:%s:%s:/bin/date\n", FTP_NAME, tconf.uid, gid, tconf.comment, tconf.homedir); + + fptr = fopen(_PATH_MASTERPASSWD,"a"); + if (! fptr) { + msgConfirm("Could not open master password file."); + return DITEM_FAILURE; + } + fprintf(fptr, pwline); + fclose(fptr); + msgNotify("Remaking password file: %s", _PATH_MASTERPASSWD); + vsystem("pwd_mkdb -p %s", _PATH_MASTERPASSWD); + return DITEM_SUCCESS; +} + +/* This is it - how to get the setup values */ +static int +anonftpOpenDialog(void) +{ + WINDOW *ds_win; + ComposeObj *obj = NULL; + int n = 0, cancel = FALSE; + int max; + char title[80]; + + /* We need a curses window */ + if (!(ds_win = openLayoutDialog(ANONFTP_HELPFILE, " Anonymous FTP Configuration ", + ANONFTP_DIALOG_X, ANONFTP_DIALOG_Y, ANONFTP_DIALOG_WIDTH, ANONFTP_DIALOG_HEIGHT))) { + beep(); + msgConfirm("Cannot open anonymous ftp dialog window!!"); + return DITEM_FAILURE; + } + + /* Draw a sub-box for the path configuration */ + draw_box(ds_win, ANONFTP_DIALOG_Y + 7, ANONFTP_DIALOG_X + 8, + ANONFTP_DIALOG_HEIGHT - 11, ANONFTP_DIALOG_WIDTH - 17, + dialog_attr, border_attr); + wattrset(ds_win, dialog_attr); + sprintf(title, " Path Configuration "); + mvwaddstr(ds_win, ANONFTP_DIALOG_Y + 7, ANONFTP_DIALOG_X + 22, title); + + /** Initialize the config Data Structure **/ + bzero(&tconf, sizeof(tconf)); + + SAFE_STRCPY(tconf.group, FTP_GROUP); + SAFE_STRCPY(tconf.upload, FTP_UPLOAD); + SAFE_STRCPY(tconf.comment, FTP_COMMENT); + SAFE_STRCPY(tconf.homedir, FTP_HOMEDIR); + sprintf(tconf.uid, "%d", FTP_UID); + + /* Some more initialisation before we go into the main input loop */ + obj = initLayoutDialog(ds_win, layout, ANONFTP_DIALOG_X, ANONFTP_DIALOG_Y, &max); + + cancelbutton = okbutton = 0; + while (layoutDialogLoop(ds_win, layout, &obj, &n, max, &cancelbutton, &cancel)); + + /* Clear this crap off the screen */ + delwin(ds_win); + dialog_clear_norefresh(); + use_helpfile(NULL); + + if (cancel) + return DITEM_FAILURE; + return DITEM_SUCCESS; +} + +int +configAnonFTP(dialogMenuItem *self) +{ + int i; + + /* Be optimistic */ + i = DITEM_SUCCESS; + + dialog_clear_norefresh(); + i = anonftpOpenDialog(); + if (DITEM_STATUS(i) != DITEM_SUCCESS) { + msgConfirm("Configuration of Anonymous FTP cancelled per user request."); + return i | DITEM_RESTORE; + } + + /*** Use defaults for any invalid values ***/ + if (atoi(tconf.uid) <= 0) + sprintf(tconf.uid, "%d", FTP_UID); + + if (!tconf.group[0]) + SAFE_STRCPY(tconf.group, FTP_GROUP); + + if (!tconf.upload[0]) + SAFE_STRCPY(tconf.upload, FTP_UPLOAD); + + /*** If the user did not specify a directory, use default ***/ + + if (tconf.homedir[strlen(tconf.homedir) - 1] == '/') + tconf.homedir[strlen(tconf.homedir) - 1] = '\0'; + + if (!tconf.homedir[0]) + SAFE_STRCPY(tconf.homedir, FTP_HOMEDIR); + + /*** If HomeDir does not exist, create it ***/ + + if (!directory_exists(tconf.homedir)) + vsystem("mkdir -p %s", tconf.homedir); + + if (directory_exists(tconf.homedir)) { + msgNotify("Configuring %s for use by anon FTP.", tconf.homedir); + vsystem("chmod 555 %s && chown root.%s %s", tconf.homedir, tconf.group, tconf.homedir); + vsystem("mkdir %s/bin && chmod 555 %s/bin", tconf.homedir, tconf.homedir); + vsystem("cp /bin/ls %s/bin && chmod 111 %s/bin/ls", tconf.homedir, tconf.homedir); + vsystem("cp /bin/date %s/bin && chmod 111 %s/bin/date", tconf.homedir, tconf.homedir); + vsystem("mkdir %s/etc && chmod 555 %s/etc", tconf.homedir, tconf.homedir); + vsystem("mkdir -p %s/pub", tconf.homedir); + vsystem("mkdir -p %s/%s", tconf.homedir, tconf.upload); + vsystem("chmod 1777 %s/%s", tconf.homedir, tconf.upload); + + if (DITEM_STATUS(createFtpUser()) == DITEM_SUCCESS) { + msgNotify("Copying password information for anon FTP."); + vsystem("cp /etc/pwd.db %s/etc && chmod 444 %s/etc/pwd.db", tconf.homedir, tconf.homedir); + vsystem("cp /etc/passwd %s/etc && chmod 444 %s/etc/passwd", tconf.homedir, tconf.homedir); + vsystem("cp /etc/group %s/etc && chmod 444 %s/etc/group", tconf.homedir, tconf.homedir); + vsystem("chown -R root.%s %s/pub", tconf.group, tconf.homedir); + } + else { + msgConfirm("Unable to create FTP user! Anonymous FTP setup failed."); + i = DITEM_FAILURE; + } + + if (!msgYesNo("Create a welcome message file for anonymous FTP users?")) { + char cmd[256]; + dialog_clear(); + vsystem("echo Your welcome message here. > %s/etc/%s", tconf.homedir, MOTD_FILE); + sprintf(cmd, "%s %s/etc/%s", variable_get(VAR_EDITOR), tconf.homedir, MOTD_FILE); + if (!systemExecute(cmd)) + i = DITEM_SUCCESS; + else + i = DITEM_FAILURE; + } + } + else { + msgConfirm("Invalid Directory: %s\n" + "Anonymous FTP will not be set up.", tconf.homedir); + i = DITEM_FAILURE; + } + if (DITEM_STATUS(i) == DITEM_SUCCESS) + variable_set2("anon_ftp", "YES"); + return i | DITEM_RESTORE; +} diff --git a/release/sysinstall/apache.c b/release/sysinstall/apache.c index aa381801a5bd..ed994ec7f9c8 100644 --- a/release/sysinstall/apache.c +++ b/release/sysinstall/apache.c @@ -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.27.2.5 1997/01/20 16:15:26 jkh Exp $ + * $Id: apache.c,v 1.27.2.6 1997/03/09 22:37:48 jkh Exp $ * * Copyright (c) 1995 * Coranth Gryphon. All rights reserved. diff --git a/release/sysinstall/attr.c b/release/sysinstall/attr.c index 9e129dfee0ec..15908bd1ea64 100644 --- a/release/sysinstall/attr.c +++ b/release/sysinstall/attr.c @@ -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: attr.c,v 1.8.2.3 1997/01/19 09:59:22 jkh Exp $ + * $Id: attr.c,v 1.8.2.9 1997/03/28 23:17:23 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -60,18 +60,36 @@ attr_parse(Attribs *attr, FILE *fp) { char hold_n[MAX_NAME+1]; char hold_v[MAX_VALUE+1]; - int n, v; - enum { LOOK, COMMENT, NAME, VALUE, COMMIT } state; - int lno, num_attribs; - int ch; + char buf[BUFSIZ]; + int bp, n, v, max; + enum { LOOK, COMMENT, NAME, VALUE, MVALUE, COMMIT, FILL, STOP } state; + int num_attribs; + int ch = 0; - n = v = lno = num_attribs = 0; + n = v = num_attribs = bp = max = 0; state = LOOK; - while (state == COMMIT || (fread(&ch, 1, 1, fp) == 1)) { - /* Count lines */ - if (ch == '\n') - ++lno; + while (state != STOP) { + if (state != COMMIT) { + if (bp == max) + state = FILL; + else + ch = buf[bp++]; + } switch(state) { + case FILL: + if ((max = fread(buf, 1, sizeof buf, fp)) <= 0) { + state = STOP; + break; + } + else { + state = LOOK; + if (isDebug()) + msgDebug("Read %d characters from attributes file on state FILL\n", max); + ch = buf[0]; + bp = 1; + } + /* Fall through deliberately since we already have a character and state == LOOK */ + case LOOK: if (isspace(ch)) continue; @@ -81,11 +99,18 @@ attr_parse(Attribs *attr, FILE *fp) continue; } else if (isalpha(ch) || ch == '_') { - hold_n[n++] = ch; - state = NAME; + if (n >= MAX_NAME) { + msgDebug("Attribute name overflow at character %d, ignoring entry..\n", n); + n = 0; + state = COMMENT; + } + else { + hold_n[n++] = ch; + state = NAME; + } } else { - msgDebug("Parse config: Invalid character '%c' at line %d\n", ch, lno); + msgDebug("Parse config: Invalid character '%c (%0x)'\n", ch, ch); state = COMMENT; /* Ignore the rest of the line */ } break; @@ -96,15 +121,17 @@ attr_parse(Attribs *attr, FILE *fp) break; case NAME: - if (ch == '\n') { + if (ch == '\n' || !ch) { hold_n[n] = '\0'; - hold_v[v = 0] = '\0'; + hold_v[0] = '\0'; + v = n = 0; state = COMMIT; } else if (isspace(ch)) continue; else if (ch == '=') { hold_n[n] = '\0'; + v = n = 0; state = VALUE; } else @@ -114,39 +141,54 @@ attr_parse(Attribs *attr, FILE *fp) case VALUE: if (v == 0 && isspace(ch)) continue; - else if (ch == '{') { - /* multiline value */ - while (fread(&ch, 1, 1, fp) == 1 && ch != '}') { - if (v == MAX_VALUE) - msgFatal("Value length overflow at line %d", lno); - hold_v[v++] = ch; - } - hold_v[v] = '\0'; - state = COMMIT; - } - else if (ch == '\n') { + else if (ch == '{') + state = MVALUE; + else if (ch == '\n' || !ch) { hold_v[v] = '\0'; + v = n = 0; state = COMMIT; } else { - if (v == MAX_VALUE) - msgFatal("Value length overflow at line %d", lno); + if (v >= MAX_VALUE) { + msgDebug("Value length overflow at character %d\n", v); + state = COMMENT; + v = n = 0; + break; + } else hold_v[v++] = ch; } break; + case MVALUE: + /* multiline value */ + if (v >= MAX_VALUE) { + msgDebug("Value length overflow at character %d\n", v); + state = COMMENT; + n = v = 0; + } + else if (ch == '}') { + hold_v[v] = '\0'; + v = n = 0; + state = COMMIT; + } + else + hold_v[v++] = ch; + break; + case COMMIT: SAFE_STRCPY(attr[num_attribs].name, hold_n); SAFE_STRCPY(attr[num_attribs].value, hold_v); state = LOOK; v = n = 0; - if (++num_attribs >= MAX_ATTRIBS) - msgFatal("Attribute limit overflow; encountered a bad attributes file!"); + if (++num_attribs >= MAX_ATTRIBS) { + msgDebug("Attribute limit overflow at %d; encountered a bad attributes file!\n", num_attribs); + return DITEM_FAILURE; + } break; default: - msgFatal("Unknown state at line %d??", lno); + msgFatal("Unknown state in attr_parse??"); } } attr[num_attribs].name[0] = NULL; /* end marker */ diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c index 099e53180c5d..71c8e384b22f 100644 --- a/release/sysinstall/cdrom.c +++ b/release/sysinstall/cdrom.c @@ -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.26.2.6 1997/01/24 21:05:46 jkh Exp $ + * $Id: cdrom.c,v 1.26.2.7 1997/01/29 01:11:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/command.c b/release/sysinstall/command.c index fece9b066795..cb744b28a7d9 100644 --- a/release/sysinstall/command.c +++ b/release/sysinstall/command.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: command.c,v 1.13 1995/12/07 10:33:33 peter Exp $ + * $Id: command.c,v 1.14 1996/04/13 13:31:24 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 8323774bec61..4c3cb155f73d 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -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.51.2.29 1997/03/09 22:37:49 jkh Exp $ + * $Id: config.c,v 1.51.2.30 1997/03/12 02:19:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dev2c.sh b/release/sysinstall/dev2c.sh index cbd2e711fda1..e92404f4b6ef 100644 --- a/release/sysinstall/dev2c.sh +++ b/release/sysinstall/dev2c.sh @@ -7,7 +7,7 @@ # this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp # ---------------------------------------------------------------------------- # -# $Id: dev2c.sh,v 1.1 1994/10/26 02:53:08 phk Exp $ +# $Id: dev2c.sh,v 1.1.1.1 1995/04/27 12:50:35 jkh Exp $ # # During installation, we suffer badly of we have to run MAKEDEV. MAKEDEV # need sh, ln, chown, mknod, awk, rm, test and probably emacs too when diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c index 0cbc7217b037..8e28aa139ea3 100644 --- a/release/sysinstall/devices.c +++ b/release/sysinstall/devices.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: devices.c,v 1.49.2.11 1997/01/16 01:19:17 jkh Exp $ + * $Id: devices.c,v 1.49.2.12 1997/01/19 09:59:24 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index aa9107e3e82a..c5fed906aa5b 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.70.2.9 1997/01/24 21:05:50 jkh Exp $ + * $Id: disks.c,v 1.70.2.10 1997/03/11 16:22:22 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dispatch.c b/release/sysinstall/dispatch.c index 62ca9a47524a..0b8af8dcc6b0 100644 --- a/release/sysinstall/dispatch.c +++ b/release/sysinstall/dispatch.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dispatch.c,v 1.5.2.5 1997/03/09 22:37:51 jkh Exp $ + * $Id: dispatch.c,v 1.5.2.6 1997/03/10 21:10:34 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index 6a47e045e92d..769cdbe4d315 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.73.2.22 1997/03/15 18:00:28 jkh Exp $ + * $Id: dist.c,v 1.73.2.24 1997/03/28 09:30:14 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -390,7 +390,6 @@ distExtract(char *parent, Distribution *me) char *path, *dist, buf[BUFSIZ]; const char *tmp; FILE *fp; - Attribs *dist_attr; WINDOW *w = savescr(); struct timeval start, stop; struct sigaction old, new; @@ -432,7 +431,6 @@ distExtract(char *parent, Distribution *me) * Try to get distribution as multiple pieces, locating and parsing an * info file which tells us how many we need for this distribution. */ - dist_attr = NULL; numchunks = 0; snprintf(buf, sizeof buf, "%s/%s.inf", path, dist); @@ -457,6 +455,7 @@ distExtract(char *parent, Distribution *me) } else if (fp > 0) { int status; + Attribs *dist_attr; if (isDebug()) msgDebug("Parsing attributes file for distribution %s\n", dist); diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c index 11d5415ebd1e..317537836f78 100644 --- a/release/sysinstall/dmenu.c +++ b/release/sysinstall/dmenu.c @@ -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: dmenu.c,v 1.25.2.4 1997/01/15 04:50:07 jkh Exp $ + * $Id: dmenu.c,v 1.25.2.5 1997/01/19 10:27:56 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c index 586cabd9866f..6cf7d95d9e19 100644 --- a/release/sysinstall/doc.c +++ b/release/sysinstall/doc.c @@ -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: doc.c,v 1.19.2.1 1997/01/19 09:59:27 jkh Exp $ + * $Id: doc.c,v 1.19.2.2 1997/02/15 13:21:18 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/dos.c b/release/sysinstall/dos.c index 8d92d2a389a7..4f00f0a6a65c 100644 --- a/release/sysinstall/dos.c +++ b/release/sysinstall/dos.c @@ -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: dos.c,v 1.14.2.1 1996/12/12 11:18:15 jkh Exp $ + * $Id: dos.c,v 1.14.2.2 1997/01/19 09:59:27 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c index bce117e88306..3661b7855e3d 100644 --- a/release/sysinstall/floppy.c +++ b/release/sysinstall/floppy.c @@ -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: floppy.c,v 1.16.2.4 1997/01/24 21:05:52 jkh Exp $ + * $Id: floppy.c,v 1.16.2.5 1997/03/21 04:49:52 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/ftp.c b/release/sysinstall/ftp.c index ac1c42289498..2f6f4c5f7d0a 100644 --- a/release/sysinstall/ftp.c +++ b/release/sysinstall/ftp.c @@ -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: ftp.c,v 1.18.2.11 1997/02/18 16:23:10 jkh Exp $ + * $Id: ftp.c,v 1.18.2.12 1997/02/27 11:48:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c index 966b5bfdac8a..fc634271bb9e 100644 --- a/release/sysinstall/globals.c +++ b/release/sysinstall/globals.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: globals.c,v 1.14.2.1 1997/01/22 00:28:55 jkh Exp $ + * $Id: globals.c,v 1.14.2.2 1997/01/24 21:05:53 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/help/hardware.hlp b/release/sysinstall/help/hardware.hlp index bd6c33167d4e..3d400560c1c0 100644 --- a/release/sysinstall/help/hardware.hlp +++ b/release/sysinstall/help/hardware.hlp @@ -1,4 +1,4 @@ -Hardware Documentation Guide: $Id$ +Hardware Documentation Guide: $Id: hardware.hlp,v 1.9.2.16 1997/03/27 09:11:59 jkh Exp $ Contents last changed: July 4th, 1996 @@ -488,6 +488,21 @@ A: This is a known problem, and will hopefully be fixed in the future. local system in /usr/share/doc/FAQ, provided you have installed the `doc' distribution. +A: I have a Panasonic AL-N1 or Rios Chandler Pentium machine and I find + that the system hangs before ever getting into the installation + now. + +A: Your machine doesn't like the new i586_copyout and i586_copyin code + for some reason. To disable this, boot the installation boot floppy + and when it comes to the very first menu (the choice to drop into + kernel UserConfig mode or not) choose the command-line interface + ("expert mode") version and type the following at it: + + flags npx0 1 + + Then proceed normally to boot. This will be saved into your kernel, + so you only need to do it once. + Q: I have this CMD640 IDE controller that is said to be broken. diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp index 871f87a768a0..30b0c6be2cc2 100644 --- a/release/sysinstall/help/install.hlp +++ b/release/sysinstall/help/install.hlp @@ -621,10 +621,11 @@ experience *is* required to use the fixit option! 3.2 Upgrading from earlier releases of FreeBSD. --- ------------------------------------------- -It must first be said that this upgrade DOES NOT take a particularly -sophisticated approach to the upgrade problem, it being more a -question of providing what seemed "good enough" at the time. A truly -polished upgrade that deals properly with the broad spectrum of +It must first be said that the system installation boot floppy's +"Upgrade" option DOES NOT take a particularly sophisticated approach to +the problem of upgrading, it being more of an attempt to provide the very +minimum in what is necessary to upgrade from one release to the next. +A more polished upgrade that dealt properly with the broad spectrum of installed 2.1 systems would be nice to have, but until that gets written what you get is this - the brute-force approach! @@ -644,20 +645,26 @@ easier. IMPORTANT NOTE: What this upgrade procedure may also do, in fact, is completely destroy your system (though much more quickly than you -would have been able to destroy it yourself). It is simply impossible +would have been able to destroy it yourself) and it is simply impossible to guarantee that this procedure's crude form of upgrade automation -will work in all cases and if you do this upgrade without proper +will work in all cases. If you do this upgrade without proper BACKUPS for any important data then you really must like living life close to the edge, that's all we can say! -NOTE to 2.0 users: We're sorry, but the "slice" changes that were -added in FreeBSD 2.0.5 made automated upgrades pretty difficult due to -the fact that a complete reinstall is pretty much called for. Things -may still *work* after a 2.2 upgrade, but you will also no doubt -receive many warnings at boot time about non-aligned slices and such; -we really do recommend a fresh installation for 2.0 systems! (But -back up your user data first :-). - - Jordan +SECOND IMPORTANT NOTE: If you are upgrading your source distribution, +you should *totally remove* your old /usr/src first (after saving +your kernel configuration files in /sys/i386/conf and any other src +customizations, of course) before doing the upgrade. Since the upgrade +overlays new files on top of old, things which have *moved* in /usr/src +will end up having two copies (to the great confusion of various parts of +the build system, I should also add) if you do not do this. + +2.0 users: We're sorry, but the "slice" changes that were added in +FreeBSD 2.0.5 made automated upgrades pretty difficult due to the fact +that a complete reinstall is pretty much called for. Things may still +*work* after a 2.2 upgrade, but you will also no doubt receive many +warnings at boot time about non-aligned slices and such. + +We really do recommend a fresh installation for 2.0 systems! ---- End of Installation Guide --- diff --git a/release/sysinstall/index.c b/release/sysinstall/index.c index e670a1c46f4a..d01d24630294 100644 --- a/release/sysinstall/index.c +++ b/release/sysinstall/index.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: index.c,v 1.38.2.6 1997/03/25 02:45:42 jkh Exp $ + * $Id: index.c,v 1.38.2.8 1997/03/28 09:30:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -216,9 +216,10 @@ readline(FILE *fp, char *buf, int max) } int -index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, char *descr, char *maint, char *cats, char *deps) +index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, char *descr, char *maint, char *cats, char *rdeps) { char line[1024]; + char junk[256]; char *cp; int i; @@ -233,7 +234,8 @@ index_parse(FILE *fp, char *name, char *pathto, char *prefix, char *comment, cha cp += copy_to_sep(descr, cp, '|'); cp += copy_to_sep(maint, cp, '|'); cp += copy_to_sep(cats, cp, '|'); - (void)copy_to_sep(deps, cp, '|'); + cp += copy_to_sep(junk, cp, '|'); /* build deps - not used */ + (void)copy_to_sep(rdeps, cp, '|'); /* We're not actually interested in any of the other fields */ return 0; } diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index a16ae4ca3bb5..24a8bb10d387 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -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.134.2.38 1997/03/18 07:03:41 mpp Exp $ + * $Id: install.c,v 1.134.2.41 1997/03/28 09:30:18 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -498,14 +498,15 @@ installNovice(dialogMenuItem *self) "may do so by typing: /stand/sysinstall."); } if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) { - if (!msgYesNo("Would you like to configure any SLIP/PPP or network interface devices?")) { + if (!msgYesNo("Would you like to configure any Ethernet or SLIP/PPP network devices?")) { Device *tmp; + dialog_clear_norefresh(); tmp = tcpDeviceSelect(); + dialog_clear_norefresh(); if (tmp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name)) if (!tmp->init(tmp)) msgConfirm("Initialization of %s device failed.", tmp->name); - dialog_clear_norefresh(); } } @@ -585,11 +586,13 @@ installNovice(dialogMenuItem *self) configUsers(self); dialog_clear_norefresh(); - if (!msgYesNo("Would you like to set the system manager's password now?\n\n" - "This is the password you'll use to log in as \"root\".")) { + msgConfirm("Now you must set the system manager's password.\n" + "This is the password you'll use to log in as \"root\"."); + { WINDOW *w = savescr(); - systemExecute("passwd root"); + if (!systemExecute("passwd root")) + variable_set2("root_password", "YES"); restorescr(w); } diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c index dafbbfcc76e2..6279de51ff63 100644 --- a/release/sysinstall/installUpgrade.c +++ b/release/sysinstall/installUpgrade.c @@ -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.33.2.8 1997/03/07 07:46:40 jkh Exp $ + * $Id: installUpgrade.c,v 1.33.2.9 1997/03/07 16:16:56 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/keymap.c b/release/sysinstall/keymap.c index 459f4cbe2860..2b17b16cb926 100644 --- a/release/sysinstall/keymap.c +++ b/release/sysinstall/keymap.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: keymap.c,v 1.1.2.3 1997/01/15 04:50:10 jkh Exp $ * */ diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c index 996d683e77b7..31c54d6d334b 100644 --- a/release/sysinstall/label.c +++ b/release/sysinstall/label.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: label.c,v 1.63.2.4 1997/03/08 16:16:15 jkh Exp $ + * $Id: label.c,v 1.63.2.5 1997/03/11 17:48:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/lang.c b/release/sysinstall/lang.c index 0d6963b1b4a0..304e931a1865 100644 --- a/release/sysinstall/lang.c +++ b/release/sysinstall/lang.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: lang.c,v 1.7 1995/06/11 19:30:01 rgrimes Exp $ + * $Id: lang.c,v 1.8 1996/04/13 13:31:46 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c index 0a5b00656b09..11b21cddeac2 100644 --- a/release/sysinstall/main.c +++ b/release/sysinstall/main.c @@ -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: main.c,v 1.28.2.10 1997/02/20 16:46:39 jkh Exp $ + * $Id: main.c,v 1.28.2.11 1997/03/21 04:49:53 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index e2013ef8398b..32b490358b0c 100644 --- a/release/sysinstall/media.c +++ b/release/sysinstall/media.c @@ -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: media.c,v 1.62.2.15 1997/03/11 16:41:15 jkh Exp $ + * $Id: media.c,v 1.62.2.16 1997/03/21 04:49:54 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index ae51477f934c..f0682d163546 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -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.89.2.33 1997/03/25 02:45:52 jkh Exp $ + * $Id: menus.c,v 1.89.2.34 1997/03/27 00:41:02 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c index dc8c87be7a5f..1eecd27feefa 100644 --- a/release/sysinstall/misc.c +++ b/release/sysinstall/misc.c @@ -1,7 +1,7 @@ /* * Miscellaneous support routines.. * - * $Id: misc.c,v 1.22.2.8 1997/02/19 17:12:26 jkh Exp $ + * $Id: misc.c,v 1.22.2.9 1997/03/09 22:37:58 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c index 7770c7005f62..b094a7db16bf 100644 --- a/release/sysinstall/msg.c +++ b/release/sysinstall/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: msg.c,v 1.41 1996/10/01 04:56:34 jkh Exp $ + * $Id: msg.c,v 1.41.2.1 1996/12/09 09:29:05 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c index f2da9a4e044d..c12fe876afc4 100644 --- a/release/sysinstall/network.c +++ b/release/sysinstall/network.c @@ -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: network.c,v 1.16.2.8 1997/01/15 04:50:18 jkh Exp $ + * $Id: network.c,v 1.16.2.9 1997/01/19 09:59:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/nfs.c b/release/sysinstall/nfs.c index e81bcbd270fd..ffc8e4081d4b 100644 --- a/release/sysinstall/nfs.c +++ b/release/sysinstall/nfs.c @@ -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: nfs.c,v 1.11.2.4 1997/01/22 00:28:58 jkh Exp $ + * $Id: nfs.c,v 1.11.2.5 1997/01/24 21:06:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c index d418110b966f..b58610a2247a 100644 --- a/release/sysinstall/options.c +++ b/release/sysinstall/options.c @@ -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$ + * $Id: options.c,v 1.44.2.7 1997/03/11 09:13:12 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 8b66b09d1792..dfdb505a2413 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -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.48.2.8 1997/03/08 11:13:22 jkh Exp $ + * $Id: package.c,v 1.48.2.9 1997/03/22 15:20:26 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/register.c b/release/sysinstall/register.c index 12815f0c4643..1b47c3100cb4 100644 --- a/release/sysinstall/register.c +++ b/release/sysinstall/register.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: register.c,v 1.1.2.4 1997/03/16 20:08:22 jkh Exp $ + * $Id: register.c,v 1.1.2.5 1997/03/25 02:45:59 jkh Exp $ * * Copyright (c) 1997 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/samba.c b/release/sysinstall/samba.c index 89020039b9b8..ebcc016a7d12 100644 --- a/release/sysinstall/samba.c +++ b/release/sysinstall/samba.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: samba.c,v 1.9.2.3 1997/01/19 09:59:37 jkh Exp $ + * $Id: samba.c,v 1.9.2.4 1997/01/20 16:15:30 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard & Coranth Gryphon. All rights reserved. diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index ca6001dc5725..cdda27f4d029 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -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.82.2.27 1997/03/15 16:23:11 jkh Exp $ + * $Id: sysinstall.h,v 1.82.2.29 1997/03/29 06:41:56 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -44,7 +44,6 @@ #include <string.h> #include <unistd.h> #include <dialog.h> -#include <dialog.h> #include "ui_objects.h" #include "dir.h" #include "colors.h" diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c index e5dc4a99f145..be3c66da5eaf 100644 --- a/release/sysinstall/system.c +++ b/release/sysinstall/system.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: system.c,v 1.66.2.8 1997/03/11 09:13:13 jkh Exp $ * * Jordan Hubbard * diff --git a/release/sysinstall/tape.c b/release/sysinstall/tape.c index 26e792731c9f..189c05153ffc 100644 --- a/release/sysinstall/tape.c +++ b/release/sysinstall/tape.c @@ -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: tape.c,v 1.13.2.2 1997/01/19 09:59:41 jkh Exp $ + * $Id: tape.c,v 1.13.2.3 1997/01/22 00:29:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c index 7ec7a18dda06..371ea97ffe05 100644 --- a/release/sysinstall/tcpip.c +++ b/release/sysinstall/tcpip.c @@ -1,5 +1,5 @@ /* - * $Id: tcpip.c,v 1.48.2.14 1997/02/17 22:09:41 jkh Exp $ + * $Id: tcpip.c,v 1.48.2.15 1997/03/09 22:38:00 jkh Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. diff --git a/release/sysinstall/uc_eisa.c b/release/sysinstall/uc_eisa.c index 11f199bc234c..def07511d9bf 100644 --- a/release/sysinstall/uc_eisa.c +++ b/release/sysinstall/uc_eisa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: uc_eisa.c,v 1.1 1996/10/03 06:01:37 jkh Exp $ + * $Id: uc_eisa.c,v 1.2 1996/10/12 20:23:08 erich Exp $ */ #include <sys/types.h> diff --git a/release/sysinstall/uc_isa.c b/release/sysinstall/uc_isa.c index 8562af447f15..65f0b02881a1 100644 --- a/release/sysinstall/uc_isa.c +++ b/release/sysinstall/uc_isa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: uc_isa.c,v 1.1 1996/10/03 06:01:38 jkh Exp $ + * $Id: uc_isa.c,v 1.2 1996/10/12 20:23:12 erich Exp $ */ #include <sys/types.h> diff --git a/release/sysinstall/uc_kmem.c b/release/sysinstall/uc_kmem.c index e0df87209a69..9e5908ca0fcb 100644 --- a/release/sysinstall/uc_kmem.c +++ b/release/sysinstall/uc_kmem.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: uc_kmem.c,v 1.1 1996/10/03 06:01:39 jkh Exp $ */ #include <sys/types.h> diff --git a/release/sysinstall/uc_list.c b/release/sysinstall/uc_list.c index 6506c5eb6b1e..50de4bed990d 100644 --- a/release/sysinstall/uc_list.c +++ b/release/sysinstall/uc_list.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: uc_list.c,v 1.1 1996/10/03 06:01:40 jkh Exp $ */ #include <sys/types.h> diff --git a/release/sysinstall/uc_main.c b/release/sysinstall/uc_main.c index 41a0269291e8..280c457d4e18 100644 --- a/release/sysinstall/uc_main.c +++ b/release/sysinstall/uc_main.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * library functions for userconfig library * - * $Id: uc_main.c,v 1.13.4.3 1997/01/19 09:59:43 jkh Exp $ + * $Id: uc_main.c,v 1.13.4.4 1997/01/19 10:59:06 jkh Exp $ */ #include <sys/types.h> diff --git a/release/sysinstall/uc_main.h b/release/sysinstall/uc_main.h index e67d61d85305..bbfa7e7a8f7f 100644 --- a/release/sysinstall/uc_main.h +++ b/release/sysinstall/uc_main.h @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: uc_main.h,v 1.1 1996/10/03 06:01:42 jkh Exp $ + * $Id: uc_main.h,v 1.2 1996/10/12 20:23:21 erich Exp $ */ #define ISA_BIOTAB 0 diff --git a/release/sysinstall/uc_pci.c b/release/sysinstall/uc_pci.c index ec74e8ea545f..273c549b41bb 100644 --- a/release/sysinstall/uc_pci.c +++ b/release/sysinstall/uc_pci.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: uc_pci.c,v 1.1 1996/10/03 06:01:43 jkh Exp $ + * $Id: uc_pci.c,v 1.2 1996/10/12 20:23:23 erich Exp $ */ #include <sys/types.h> diff --git a/release/sysinstall/uc_scsi.c b/release/sysinstall/uc_scsi.c index fea3fff2b217..df0d1424841f 100644 --- a/release/sysinstall/uc_scsi.c +++ b/release/sysinstall/uc_scsi.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: uc_scsi.c,v 1.3 1996/10/12 20:23:26 erich Exp $ + * $Id: uc_scsi.c,v 1.3.4.1 1997/02/20 07:22:43 jkh Exp $ */ #include <sys/types.h> diff --git a/release/sysinstall/ufs.c b/release/sysinstall/ufs.c index 9bbea03cbd65..7c857aaee773 100644 --- a/release/sysinstall/ufs.c +++ b/release/sysinstall/ufs.c @@ -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: ufs.c,v 1.9 1996/08/23 07:56:01 jkh Exp $ + * $Id: ufs.c,v 1.9.2.1 1996/12/12 11:18:29 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/user.c b/release/sysinstall/user.c index 91e11308c53c..25f1b81f40ef 100644 --- a/release/sysinstall/user.c +++ b/release/sysinstall/user.c @@ -1,5 +1,5 @@ /* - * $Id: user.c,v 1.1.2.9 1997/02/18 04:39:18 jkh Exp $ + * $Id: user.c,v 1.1.2.10 1997/03/09 22:38:01 jkh Exp $ * * Copyright (c) 1996 * Jörg Wunsch. All rights reserved. diff --git a/release/sysinstall/variable.c b/release/sysinstall/variable.c index 6be88a6b994c..1d5e1af80326 100644 --- a/release/sysinstall/variable.c +++ b/release/sysinstall/variable.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: variable.c,v 1.11.2.2 1996/12/12 11:18:30 jkh Exp $ + * $Id: variable.c,v 1.11.2.3 1997/01/17 08:53:50 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. diff --git a/release/sysinstall/variable_load.c b/release/sysinstall/variable_load.c index 63b0d419edca..ac2195963cfa 100644 --- a/release/sysinstall/variable_load.c +++ b/release/sysinstall/variable_load.c @@ -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$ + * $Id: variable_load.c,v 1.1.2.1 1997/03/28 02:25:15 jkh Exp $ * * Copyright (c) 1997 * Paul Traina. All rights reserved. @@ -41,46 +41,33 @@ int variableLoad(dialogMenuItem * self) { - extern char *distWanted; int what = DITEM_RESTORE; - char *cp, *old; char buf[BUFSIZ]; + extern char *distWanted; + char *cp; FILE *fp; mediaClose(); dialog_clear_norefresh(); - if ((cp = variable_get(VAR_INSTALL_CFG)) != NULL) { - old = strdup(cp); - cp = variable_get_value(VAR_INSTALL_CFG, - "Specify the name of a configuration file\n" - "residing on a MSDOS or UFS floppy.\n\n" - "(default: %s)"); - if (!cp) { - free(old); - return DITEM_FAILURE | what; - } - if (!*cp) - variable_set2(VAR_INSTALL_CFG, cp); - - free(old); - - } else { - cp = variable_get_value(VAR_INSTALL_CFG, - "Specify the name of a configuration file\n" - "residing on a MSDOS or UFS floppy."); - if (!cp || !*cp) { - variable_unset(VAR_INSTALL_CFG); - return DITEM_FAILURE | what; - } + cp = variable_get_value(VAR_INSTALL_CFG, + "Specify the name of a configuration file\n" + "residing on a MSDOS or UFS floppy."); + if (!cp || !*cp) { + variable_unset(VAR_INSTALL_CFG); + return DITEM_FAILURE | what; } distWanted = cp = variable_get(VAR_INSTALL_CFG); /* Try to open the floppy drive if we can do that first */ - if (DITEM_STATUS(mediaSetFloppy(NULL)) == DITEM_FAILURE || - mediaDevice->init(mediaDevice)) { - msgConfirm("Unable to access floppy."); + if (DITEM_STATUS(mediaSetFloppy(NULL)) == DITEM_FAILURE) { + msgConfirm("Unable to set media device to floppy."); + return DITEM_FAILURE | what; + } + + if (!mediaDevice->init(mediaDevice)) { + msgConfirm("Unable to mount floppy filesystem."); return DITEM_FAILURE | what; } diff --git a/release/sysinstall/version.h b/release/sysinstall/version.h index b42c26e8937d..40b1631dd504 100644 --- a/release/sysinstall/version.h +++ b/release/sysinstall/version.h @@ -1 +1 @@ -#define RELEASE_NAME "__RELEASE" +#define RELEASE_NAME "2.2.1-RELEASE" diff --git a/release/sysinstall/wizard.c b/release/sysinstall/wizard.c index 59831ea92fc5..469062ce179b 100644 --- a/release/sysinstall/wizard.c +++ b/release/sysinstall/wizard.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id$ + * $Id: wizard.c,v 1.8.2.1 1997/01/15 04:50:23 jkh Exp $ * */ |