Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for the lay-of-the-land as described in release(7). As such, move

Browse Source 
all pathname-on-server related definitions to MI code, since they are now
defined to be consistent across all platforms.  Also, nuke the "rels" global,
since release numbers are now always specified in "long form", i.e. 1.3A
vs. 13A.
This commit is contained in:
thorpej 1997-11-25 06:53:07 +00:00
parent 5cb04dc65b
commit 75dd009b1d
8 changed files with 64 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
distrib/utils/sysinst/arch/arm32/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.2 1997/11/10 03:57:00 jonathan Exp $ */
/* $NetBSD: md.h,v 1.3 1997/11/25 06:53:16 thorpej Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -55,28 +55,25 @@ EXTERN char *disk_names[]
#define ISDISKSTART(dn) (dn == 'w' || dn == 's')
/* Definition of files to retreive from ftp. */
EXTERN char ftp_prefix[STRSIZE] INIT("/binary/Tarfiles");
EXTERN char dist_postfix[STRSIZE] INIT(".tar.gz");
EXTERN distinfo dist_list[]
#ifdef MAIN
= {
{"kern%s%s", 1, NULL, "Kernel : "},
{"base%s%s", 1, NULL, "Base : "},
{"etc%s%s", 1, NULL, "System (/etc): "},
{"comp%s%s", 1, NULL, "Compiler : "},
{"games%s%s", 1, NULL, "Games : "},
{"man%s%s", 1, NULL, "Manuals : "},
{"misc%s%s", 1, NULL, "Miscellaneous: "},
{"text%s%s", 1, NULL, "Text tools : "},
/*
{"xbase%s%s", 1, NULL, "X11 clients : "},
{"xfont%s%s", 1, NULL, "X11 fonts : "},
{"xfont%s%s", 1, NULL, "X11 servers : "},
{"xcontrib%s%s",1, NULL, "X11 contrib : "},
{"xcomp%s%s", 1, NULL, "X programming: "},
*/
{NULL, 0, NULL }
{"kern", 1, NULL, "Kernel : "},
{"base", 1, NULL, "Base : "},
{"etc", 1, NULL, "System (/etc): "},
{"comp", 1, NULL, "Compiler : "},
{"games", 1, NULL, "Games : "},
{"man", 1, NULL, "Manuals : "},
{"misc", 1, NULL, "Miscellaneous: "},
{"text", 1, NULL, "Text tools : "},
#if 0
{"xbase", 1, NULL, "X11 clients : "},
{"xfont", 1, NULL, "X11 fonts : "},
{"xfont", 1, NULL, "X11 servers : "},
{"xcontrib",1, NULL, "X11 contrib : "},
{"xcomp", 1, NULL, "X programming: "},
#endif
{NULL, 0, NULL, NULL }
}
#endif
;

22
distrib/utils/sysinst/arch/i386/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.6 1997/11/10 03:57:16 jonathan Exp $ */
/* $NetBSD: md.h,v 1.7 1997/11/25 06:53:19 thorpej Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -62,20 +62,18 @@ EXTERN int usefull;
* i386 has the MD set kern first, because generic kernels are too
* big to fit on install floppies. i386 does not yet include the x sets.
*/
EXTERN char ftp_prefix[STRSIZE] INIT("/binary/Tarfiles");
EXTERN char dist_postfix[STRSIZE] INIT(".tar.gz");
EXTERN distinfo dist_list[]
#ifdef MAIN
= {
{"kern%s%s", 1, "ae", "Kernel : "},
{"base%s%s", 1, "bo", "Base : "},
{"etc%s%s", 1, "aa", "System (/etc): "},
{"comp%s%s", 1, "bd", "Compiler : "},
{"games%s%s", 1, "am","Games : "},
{"man%s%s", 1, "ak", "Manuals : "},
{"misc%s%s", 1, "ai", "Miscellaneous: "},
{"text%s%s", 1, "ae", "Text tools : "},
{NULL, 0, NULL }
{"kern", 1, "ae", "Kernel : "},
{"base", 1, "bo", "Base : "},
{"etc", 1, "aa", "System (/etc): "},
{"comp", 1, "bd", "Compiler : "},
{"games", 1, "am", "Games : "},
{"man", 1, "ak", "Manuals : "},
{"misc", 1, "ai", "Miscellaneous: "},
{"text", 1, "ae", "Text tools : "},
{NULL, 0, NULL, NULL }
}
#endif
;

20
distrib/utils/sysinst/arch/pc532/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.3 1997/11/10 03:57:23 jonathan Exp $ */
/* $NetBSD: md.h,v 1.4 1997/11/25 06:53:22 thorpej Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -54,19 +54,17 @@ EXTERN char *disk_names[]
#define ISDISKSTART(dn) (dn == 's')
/* Definition of files to retreive from ftp. */
EXTERN char ftp_prefix[STRSIZE] INIT("/binary/Tarfiles");
EXTERN char dist_postfix[STRSIZE] INIT(".tar.gz");
EXTERN distinfo dist_list[]
#ifdef MAIN
= {
{"base%s%s", 1, NULL, "Base : "},
{"etc%s%s", 1, NULL, "System (/etc): "},
{"comp%s%s", 1, NULL, "Compiler : "},
{"games%s%s", 1, NULL,"Games : "},
{"man%s%s", 1, NULL, "Manuals : "},
{"misc%s%s", 1, NULL, "Miscellaneous: "},
{"text%s%s", 1, NULL, "Text tools : "},
{NULL, 0, NULL }
{"base", 1, NULL, "Base : "},
{"etc", 1, NULL, "System (/etc): "},
{"comp", 1, NULL, "Compiler : "},
{"games", 1, NULL, "Games : "},
{"man", 1, NULL, "Manuals : "},
{"misc", 1, NULL, "Miscellaneous: "},
{"text", 1, NULL, "Text tools : "},
{NULL, 0, NULL, NULL }
}
#endif
;

33
distrib/utils/sysinst/arch/pmax/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.9 1997/11/17 21:27:47 simonb Exp $ */
/* $NetBSD: md.h,v 1.10 1997/11/25 06:53:26 thorpej Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -89,26 +89,23 @@ EXTERN char *disk_names[]
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
*/
EXTERN char ftp_prefix[STRSIZE] INIT("/binary/Tarfiles");
EXTERN char dist_postfix[STRSIZE] INIT(".tar.gz");
EXTERN distinfo dist_list[]
#ifdef MAIN
= {
{"kern%s%s", 1, NULL, "Kernel : "},
{"base%s%s", 1, NULL, "Base : "},
{"etc%s%s", 1, NULL, "System (/etc): "},
{"comp%s%s", 1, NULL, "Compiler : "},
{"games%s%s", 1, NULL, "Games : "},
{"man%s%s", 1, NULL, "Manuals : "},
{"misc%s%s", 1, NULL, "Miscellaneous: "},
{"text%s%s", 1, NULL, "Text tools : "},
{"xbase%s%s", 1, NULL, "X11 clients : "},
{"xfont%s%s", 1, NULL, "X11 fonts : "},
{"xserver%s%s", 1, NULL, "X11 servers : "},
{"xcontrib%s%s",1, NULL, "X11 contrib : "},
{"xcomp%s%s", 1, NULL, "X programming: "},
{NULL, 0, NULL }
{"kern", 1, NULL, "Kernel : "},
{"base", 1, NULL, "Base : "},
{"etc", 1, NULL, "System (/etc): "},
{"comp", 1, NULL, "Compiler : "},
{"games", 1, NULL, "Games : "},
{"man", 1, NULL, "Manuals : "},
{"misc", 1, NULL, "Miscellaneous: "},
{"text", 1, NULL, "Text tools : "},
{"xbase", 1, NULL, "X11 clients : "},
{"xfont", 1, NULL, "X11 fonts : "},
{"xserver", 1, NULL, "X11 servers : "},
{"xcontrib",1, NULL, "X11 contrib : "},
{"xcomp", 1, NULL, "X programming: "},
{NULL, 0, NULL, NULL }
}
#endif
;

6
distrib/utils/sysinst/defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: defs.h,v 1.21 1997/11/11 00:43:36 phil Exp $ */
/* $NetBSD: defs.h,v 1.22 1997/11/25 06:53:07 thorpej Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -78,7 +78,6 @@ typedef struct distinfo {
/* variables */
EXTERN char rel[SSTRSIZE] INIT(REL);
EXTERN char rels[SSTRSIZE] INIT(REL);
EXTERN char machine[SSTRSIZE] INIT(MACH);
EXTERN int yesno;
@ -156,6 +155,7 @@ EXTERN int clean_dist_dir INIT(0);
EXTERN char ext_dir[STRSIZE] INIT("");
EXTERN char ftp_host[STRSIZE] INIT("ftp.netbsd.org");
EXTERN char ftp_dir[STRSIZE] INIT("/pub/NetBSD/NetBSD-");
EXTERN char ftp_prefix[STRSIZE] INIT("/binary/sets");
EXTERN char ftp_user[STRSIZE] INIT("ftp");
EXTERN char ftp_pass[STRSIZE] INIT("");
@ -171,6 +171,8 @@ EXTERN char localfs_dir[STRSIZE] INIT("");
EXTERN int mnt2_mounted INIT(0);
EXTERN char dist_postfix[STRSIZE] INIT(".tgz");
/* Vars for runing commands ... */
EXTERN char command[STRSIZE];

11
distrib/utils/sysinst/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.5 1997/11/21 12:08:06 simonb Exp $ */
/* $NetBSD: main.c,v 1.6 1997/11/25 06:53:10 thorpej Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -71,7 +71,6 @@ int main(int argc, char **argv)
case 'r':
/* Release name other than compiled in release. */
strncpy (rel, optarg, SSTRSIZE);
strncpy (rels, optarg, SSTRSIZE);
break;
case '?':
default:
@ -83,14 +82,6 @@ int main(int argc, char **argv)
win = newwin(22,78,1,1);
msg_window(win);
/* Change X.Y release number into XY */
{ char *t, *r;
for (t=r=rels; *t; t++)
if (*t != '.')
*r++=*t;
*r = 0;
}
/* Watch for SIGINT and clean up */
(void) signal(SIGINT, inthandler);

6
distrib/utils/sysinst/net.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: net.c,v 1.22 1997/11/25 00:24:54 thorpej Exp $ */
/* $NetBSD: net.c,v 1.23 1997/11/25 06:53:11 thorpej Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -254,7 +254,7 @@ get_via_ftp (void)
cd_dist_dir ("ftp");
/* Fill in final values for ftp_dir. */
strncat (ftp_dir, rels, STRSIZE-strlen(ftp_dir));
strncat (ftp_dir, rel, STRSIZE-strlen(ftp_dir));
strcat (ftp_dir, "/");
strncat (ftp_dir, machine, STRSIZE-strlen(ftp_dir));
strncat (ftp_dir, ftp_prefix, STRSIZE-strlen(ftp_dir));
@ -267,7 +267,7 @@ get_via_ftp (void)
list++;
continue;
}
snprintf (filename, SSTRSIZE, list->name, rels, dist_postfix);
snprintf (filename, SSTRSIZE, "%s%s", list->name, dist_postfix);
if (strcmp ("ftp", ftp_user) == 0)
ret = run_prog("/usr/bin/ftp -a ftp://%s/%s/%s",
ftp_host, ftp_dir,

10
distrib/utils/sysinst/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.20 1997/11/13 03:06:45 jonathan Exp $ */
/* $NetBSD: util.c,v 1.21 1997/11/25 06:53:13 thorpej Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -144,9 +144,9 @@ int get_via_floppy (void)
list = dist_list;
while (list->name) {
strcpy (post, ".aa");
snprintf (distname, STRSIZE, list->name, rels, dist_postfix);
snprintf (distname, STRSIZE, "%s%s", list->name, dist_postfix);
while (list->getit && strcmp(&post[1],list->fdlast) <= 0) {
snprintf (fname, STRSIZE, list->name, rels, post);
snprintf (fname, STRSIZE, list->name, rel, post);
snprintf (fullname, STRSIZE, "/mnt2/%s", fname);
first = 1;
while (!mounted || stat(fullname, &sb)) {
@ -195,7 +195,7 @@ get_via_cdrom(void)
process_menu (MENU_cdromsource);
/* Fill in final default path. */
strncat (cdrom_dir, rels, STRSIZE-strlen(cdrom_dir));
strncat (cdrom_dir, rel, STRSIZE-strlen(cdrom_dir));
strcat (cdrom_dir, "/");
strncat (cdrom_dir, machine, STRSIZE-strlen(cdrom_dir));
@ -332,7 +332,7 @@ extract_dist (void)
list = dist_list;
while (list->name) {
if (list->getit) {
(void)snprintf (distname, STRSIZE, list->name, rels,
(void)snprintf (distname, STRSIZE, "%s%s", list->name,
dist_postfix);
(void)snprintf (fname, STRSIZE, "%s/%s", ext_dir,
distname);