Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/utils/sysinst When installing from floppy disks, let...



details:   https://anonhg.NetBSD.org/src/rev/5c4026b161d1
branches:  trunk
changeset: 545313:5c4026b161d1
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sun Apr 06 16:12:36 2003 +0000

description:
When installing from floppy disks, let the user say which is the last one
on a set, instead of hardcoding the number of parts in sysinst (which gets
out of sync easily).  The fdlast field of the distinfo struct has been
removed.

This solution is a bit simplistic but...  anybody using the floppy
installation method will have to split sets himself (as we don't provide
them), so he will know which is the last one.  Also, he will be able to
use whatever chunk size he wants.

Closes PR install/5050.  Ok'ed by fvdl.

diffstat:

 distrib/utils/sysinst/arch/acorn26/md.h      |  34 +++++++++++-----------
 distrib/utils/sysinst/arch/acorn32/md.h      |  38 +++++++++++++-------------
 distrib/utils/sysinst/arch/alpha/md.h        |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/amiga/md.h        |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/arc/md.h          |  30 ++++++++++----------
 distrib/utils/sysinst/arch/atari/md.h        |  38 +++++++++++++-------------
 distrib/utils/sysinst/arch/bebox/md.h        |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/cats/md.h         |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/evbarm/md.h       |  38 +++++++++++++-------------
 distrib/utils/sysinst/arch/evbppc/md.h       |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/hp300/md.h        |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/hpcmips/md.h      |  34 +++++++++++-----------
 distrib/utils/sysinst/arch/i386/md.h         |  40 ++++++++++++++--------------
 distrib/utils/sysinst/arch/mac68k/md.h       |  34 +++++++++++-----------
 distrib/utils/sysinst/arch/macppc/md.h       |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/mipsco/md.h       |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/mvme68k/md.h      |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/news68k/md.h      |  34 +++++++++++-----------
 distrib/utils/sysinst/arch/newsmips/md.h     |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/pc532/md.h        |  18 ++++++------
 distrib/utils/sysinst/arch/playstation2/md.h |  20 +++++++-------
 distrib/utils/sysinst/arch/pmax/md.h         |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/prep/md.h         |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/sandpoint/md.h    |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/sgimips/md.h      |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/shark/md.h        |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/sparc/md.h        |  36 ++++++++++++------------
 distrib/utils/sysinst/arch/sparc64/md.h      |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/vax/md.h          |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/x68k/md.h         |  32 +++++++++++-----------
 distrib/utils/sysinst/arch/x86_64/md.h       |  32 +++++++++++-----------
 distrib/utils/sysinst/defs.h                 |   3 +-
 distrib/utils/sysinst/menus.mi.en            |   4 ++-
 distrib/utils/sysinst/msg.mi.en              |   9 ++++-
 distrib/utils/sysinst/util.c                 |   8 ++++-
 35 files changed, 518 insertions(+), 508 deletions(-)

diffs (truncated from 1586 to 300 lines):

diff -r 914f62f455c1 -r 5c4026b161d1 distrib/utils/sysinst/arch/acorn26/md.h
--- a/distrib/utils/sysinst/arch/acorn26/md.h   Sun Apr 06 15:56:59 2003 +0000
+++ b/distrib/utils/sysinst/arch/acorn26/md.h   Sun Apr 06 16:12:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.1 2002/05/02 23:02:51 bjh21 Exp $     */
+/*     $NetBSD: md.h,v 1.2 2003/04/06 16:12:37 jmmv Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -59,23 +59,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",   0, NULL, "Kernel       : "},
-    {"kern-FOURMEG",   0, 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   : "},
+    {"kern-GENERIC",   0, "Kernel       : "},
+    {"kern-FOURMEG",   0, "Kernel       : "},
+    {"base",           1, "Base         : "},
+    {"etc",            1, "System (/etc): "},
+    {"comp",           1, "Compiler     : "},
+    {"games",          1, "Games        : "},
+    {"man",            1, "Manuals      : "},
+    {"misc",           1, "Miscellaneous: "},
+    {"text",           1, "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: "},
-    {"xmisc",          1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",          1, "X11 clients  : "},
+    {"xfont",          1, "X11 fonts    : "},
+    {"xserver",                1, "X11 servers  : "},
+    {"xcontrib",       1, "X11 contrib  : "},
+    {"xcomp",          1, "X programming: "},
+    {"xmisc",          1, "X11 Misc.    : "},
+    { NULL,            0, NULL }
 }
 #endif
 ;
diff -r 914f62f455c1 -r 5c4026b161d1 distrib/utils/sysinst/arch/acorn32/md.h
--- a/distrib/utils/sysinst/arch/acorn32/md.h   Sun Apr 06 15:56:59 2003 +0000
+++ b/distrib/utils/sysinst/arch/acorn32/md.h   Sun Apr 06 16:12:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.4 2002/04/02 17:11:20 thorpej Exp $   */
+/*     $NetBSD: md.h,v 1.5 2003/04/06 16:12:37 jmmv Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -59,25 +59,25 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",   0, NULL, "Kernel       : "},
-    {"kern-RPC_WSCONS",        1, NULL, "Kernel       : "},
-    {"kern-NC",                0, NULL, "Kernel       : "},
-    {"kern-NC_WSCONS", 0, 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   : "},
+    {"kern-GENERIC",   0, "Kernel       : "},
+    {"kern-RPC_WSCONS",        1, "Kernel       : "},
+    {"kern-NC",                0, "Kernel       : "},
+    {"kern-NC_WSCONS", 0, "Kernel       : "},
+    {"base",           1, "Base         : "},
+    {"etc",            1, "System (/etc): "},
+    {"comp",           1, "Compiler     : "},
+    {"games",          1, "Games        : "},
+    {"man",            1, "Manuals      : "},
+    {"misc",           1, "Miscellaneous: "},
+    {"text",           1, "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: "},
-    {"xmisc",          1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",          1, "X11 clients  : "},
+    {"xfont",          1, "X11 fonts    : "},
+    {"xserver",                1, "X11 servers  : "},
+    {"xcontrib",       1, "X11 contrib  : "},
+    {"xcomp",          1, "X programming: "},
+    {"xmisc",          1, "X11 Misc.    : "},
+    { NULL,            0, NULL }
 }
 #endif
 ;
diff -r 914f62f455c1 -r 5c4026b161d1 distrib/utils/sysinst/arch/alpha/md.h
--- a/distrib/utils/sysinst/arch/alpha/md.h     Sun Apr 06 15:56:59 2003 +0000
+++ b/distrib/utils/sysinst/arch/alpha/md.h     Sun Apr 06 16:12:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.9 2001/11/29 23:20:56 thorpej Exp $   */
+/*     $NetBSD: md.h,v 1.10 2003/04/06 16:12:38 jmmv Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -51,24 +51,24 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",   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   : "},
+    {"kern-GENERIC",   1, "Kernel       : "},
+    {"base",           1, "Base         : "},
+    {"etc",            1, "System (/etc): "},
+    {"comp",           1, "Compiler     : "},
+    {"games",          1, "Games        : "},
+    {"man",            1, "Manuals      : "},
+    {"misc",           1, "Miscellaneous: "},
+    {"text",           1, "Text tools   : "},
 
-    {"xbase",          1, NULL, "X11 clients  : "},
-    {"xfont",          1, NULL, "X11 fonts    : "},
+    {"xbase",          1, "X11 clients  : "},
+    {"xfont",          1, "X11 fonts    : "},
 #ifdef notyet
-    {"xserver",                1, NULL, "X11 servers  : "},
+    {"xserver",                1, "X11 servers  : "},
 #endif
-    {"xcontrib",       1, NULL, "X11 contrib  : "},
-    {"xcomp",          1, NULL, "X programming: "},
-    {"xmisc",          1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xcontrib",       1, "X11 contrib  : "},
+    {"xcomp",          1, "X programming: "},
+    {"xmisc",          1, "X11 Misc.    : "},
+    { NULL,            0, NULL }
 }
 #endif
 ;
diff -r 914f62f455c1 -r 5c4026b161d1 distrib/utils/sysinst/arch/amiga/md.h
--- a/distrib/utils/sysinst/arch/amiga/md.h     Sun Apr 06 15:56:59 2003 +0000
+++ b/distrib/utils/sysinst/arch/amiga/md.h     Sun Apr 06 16:12:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.5 2001/11/29 23:20:57 thorpej Exp $   */
+/*     $NetBSD: md.h,v 1.6 2003/04/06 16:12:38 jmmv Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -64,23 +64,23 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",   1, "ag", "Kernel       : "},
-    {"base",           1, "bw", "Base         : "},
-    {"etc",            1, "aa", "System (/etc): "},
-    {"comp",           1, "bl", "Compiler     : "},
-    {"games",          1, "am", "Games        : "},
-    {"man",            1, "ar", "Manuals      : "},
-    {"misc",           1, "aj", "Miscellaneous: "},
-    {"text",           1, "af", "Text tools   : "},
+    {"kern-GENERIC",   1, "Kernel       : "},
+    {"base",           1, "Base         : "},
+    {"etc",            1, "System (/etc): "},
+    {"comp",           1, "Compiler     : "},
+    {"games",          1, "Games        : "},
+    {"man",            1, "Manuals      : "},
+    {"misc",           1, "Miscellaneous: "},
+    {"text",           1, "Text tools   : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",          1, "al", "X11 clients  : "},
-    {"xfont",          1, "az", "X11 fonts    : "},
-    {"xserver",                1, "cr", "X11 servers  : "},
-    {"xcontrib",       1, "aa", "X11 contrib  : "},
-    {"xcomp",          1, "ah", "X programming: "},
-    {"xmisc",          1, NULL, "X11 Misc.    : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",          1, "X11 clients  : "},
+    {"xfont",          1, "X11 fonts    : "},
+    {"xserver",                1, "X11 servers  : "},
+    {"xcontrib",       1, "X11 contrib  : "},
+    {"xcomp",          1, "X programming: "},
+    {"xmisc",          1, "X11 Misc.    : "},
+    { NULL,            0, NULL }
 }
 #endif
 ;
diff -r 914f62f455c1 -r 5c4026b161d1 distrib/utils/sysinst/arch/arc/md.h
--- a/distrib/utils/sysinst/arch/arc/md.h       Sun Apr 06 15:56:59 2003 +0000
+++ b/distrib/utils/sysinst/arch/arc/md.h       Sun Apr 06 16:12:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.2 2001/11/29 23:20:57 thorpej Exp $   */
+/*     $NetBSD: md.h,v 1.3 2003/04/06 16:12:38 jmmv Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -70,20 +70,20 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",   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     : "},
-    {"xcontrib",       1, NULL, "X11 contrib   : "},
-    {"xcomp",          1, NULL, "X programming : "},
-    {"xmisc",          1, NULL, "X11 Misc.     : "},
-    {NULL, 0, NULL, NULL }
+    {"kern-GENERIC",   1, "Kernel        : "},
+    {"base",           1, "Base          : "},
+    {"etc",            1, "System (/etc) : "},
+    {"comp",           1, "Compiler      : "},
+    {"games",          1, "Games         : "},
+    {"man",            1, "Manuals       : "},
+    {"misc",           1, "Miscellaneous : "},
+    {"text",           1, "Text tools    : "},
+    {"xbase",          1, "X11 clients   : "},
+    {"xfont",          1, "X11 fonts     : "},
+    {"xcontrib",       1, "X11 contrib   : "},
+    {"xcomp",          1, "X programming : "},
+    {"xmisc",          1, "X11 Misc.     : "},
+    { NULL,            0, NULL }
 }
 #endif
 ;
diff -r 914f62f455c1 -r 5c4026b161d1 distrib/utils/sysinst/arch/atari/md.h
--- a/distrib/utils/sysinst/arch/atari/md.h     Sun Apr 06 15:56:59 2003 +0000
+++ b/distrib/utils/sysinst/arch/atari/md.h     Sun Apr 06 16:12:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.4 2002/06/19 11:44:26 leo Exp $       */
+/*     $NetBSD: md.h,v 1.5 2003/04/06 16:12:38 jmmv Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -74,26 +74,26 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-BOOT",       1, "ag", "TT030/Falcon kernel : "},
-    {"kern-HADES",      1, "ag", "Hades kernel        : "},
-    {"kern-MILAN-ISAIDE",1, "ag", "Milan ISAIDE kernel : "},
-    {"kern-MILAN-PCIIDE",1, "ag", "Milan PCIIDE kernel : "},
-    {"base",            1, "bw", "Base                : "},
-    {"etc",             1, "aa", "System (/etc)       : "},
-    {"comp",            1, "bl", "Compiler            : "},
-    {"games",           1, "am", "Games               : "},
-    {"man",             1, "ar", "Manuals             : "},
-    {"misc",            1, "aj", "Miscellaneous       : "},
-    {"text",            1, "af", "Text tools          : "},
+    {"kern-BOOT",       1, "TT030/Falcon kernel : "},
+    {"kern-HADES",      1, "Hades kernel        : "},
+    {"kern-MILAN-ISAIDE",1, "Milan ISAIDE kernel : "},
+    {"kern-MILAN-PCIIDE",1, "Milan PCIIDE kernel : "},
+    {"base",            1, "Base                : "},
+    {"etc",             1, "System (/etc)       : "},
+    {"comp",            1, "Compiler            : "},
+    {"games",           1, "Games               : "},
+    {"man",             1, "Manuals             : "},
+    {"misc",            1, "Miscellaneous       : "},
+    {"text",            1, "Text tools          : "},
 
     /* XXX no X11 on floppies, what sets are they?*/
-    {"xbase",           1, "al", "X11 clients         : "},
-    {"xfont",           1, "az", "X11 fonts           : "},
-    {"xserver",                 1, "cr", "X11 servers         : "},
-    {"xcontrib",        1, "aa", "X11 contrib         : "},
-    {"xcomp",           1, "ah", "X programming       : "},
-    {"xmisc",           1, NULL, "X11 Misc.           : "},
-    {NULL, 0, NULL, NULL }
+    {"xbase",           1, "X11 clients         : "},
+    {"xfont",           1, "X11 fonts           : "},
+    {"xserver",                 1, "X11 servers         : "},
+    {"xcontrib",        1, "X11 contrib         : "},
+    {"xcomp",           1, "X programming       : "},
+    {"xmisc",           1, "X11 Misc.           : "},
+    { NULL,             0, NULL }
 }
 #endif
 ;
diff -r 914f62f455c1 -r 5c4026b161d1 distrib/utils/sysinst/arch/bebox/md.h
--- a/distrib/utils/sysinst/arch/bebox/md.h     Sun Apr 06 15:56:59 2003 +0000
+++ b/distrib/utils/sysinst/arch/bebox/md.h     Sun Apr 06 16:12:36 2003 +0000



Home | Main Index | Thread Index | Old Index