diff options
| author | martin <martin@NetBSD.org> | 2019-11-17 07:04:33 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2019-11-17 07:04:33 +0000 |
| commit | 51040259f7968ee94033f6bd1b58d74fa042bfea (patch) | |
| tree | 515ec87847993b74fa61fbd3e7e3344538769855 /usr.sbin | |
| parent | 0146ebcd1d7a7ac9eb935d37663f1320bc6aeb5f (diff) | |
Pull up following revision(s) (requested by maya in ticket #435):
distrib/sets/maketars: revision 1.90
usr.sbin/sysinst/arch/playstation2/md.h: revision 1.2
usr.sbin/sysinst/arch/sandpoint/md.h: revision 1.3
usr.sbin/sysinst/arch/evbppc/md.h: revision 1.3
usr.sbin/sysinst/arch/hpcarm/md.h: revision 1.3
usr.sbin/sysinst/arch/mvme68k/md.h: revision 1.3
distrib/sun3/MakeInstTape: revision 1.3
usr.sbin/sysinst/util.c: revision 1.33
distrib/sets/lists/rescue/mi: revision 1.1
distrib/sets/lists/base/rescue.sun2: file removal
usr.sbin/sysinst/arch/zaurus/md.h: revision 1.3
distrib/sets/lists/base/rescue.ad.m68k.shl: file removal
distrib/sets/regpkgset: revision 1.13
usr.sbin/sysinst/arch/i386/md.h: revision 1.7
distrib/sets/lists/base/rescue.sparc: file removal
distrib/notes/mvme68k/xfer: revision 1.19
distrib/sets/sets.subr: revision 1.187
distrib/common/bootimage/Makefile.bootimage: revision 1.22
usr.sbin/sysinst/msg.mi.de: revision 1.16
usr.sbin/sysinst/arch/atari/md.h: revision 1.3
rescue/Makefile: revision 1.38
distrib/sets/lists/base/rescue.macppc: file removal
usr.sbin/sysinst/arch/arc/md.h: revision 1.4
distrib/miniroot/install.sub: revision 1.49
usr.sbin/sysinst/arch/acorn32/md.h: revision 1.3
usr.sbin/sysinst/arch/x68k/md.h: revision 1.3
usr.sbin/sysinst/arch/hpcmips/md.h: revision 1.3
usr.sbin/sysinst/arch/bebox/md.h: revision 1.3
usr.sbin/sysinst/arch/hpcsh/md.h: revision 1.2
distrib/sets/lists/base/rescue.shark: file removal
usr.sbin/sysinst/arch/emips/md.h: revision 1.5
distrib/utils/embedded/mkimage: revision 1.70
usr.sbin/sysinst/arch/shark/md.h: revision 1.3
usr.sbin/sysinst/arch/pmax/md.h: revision 1.4
usr.sbin/sysinst/arch/amiga/md.h: revision 1.4
usr.sbin/sysinst/arch/hp300/md.h: revision 1.5
rescue/list.ldconfig: file removal
distrib/sets/lists/base/rescue.ad.m68k: file removal
usr.sbin/sysinst/arch/prep/md.h: revision 1.4
usr.sbin/sysinst/arch/cats/md.h: revision 1.4
usr.sbin/sysinst/arch/amd64/md.h: revision 1.7
usr.sbin/sysinst/msg.mi.es: revision 1.17
usr.sbin/sysinst/msg.mi.fr: revision 1.20
usr.sbin/sysinst/msg.mi.pl: revision 1.23
distrib/sets/lists/base/rescue.i386: file removal
usr.sbin/sysinst/arch/evbarm/md.h: revision 1.3
distrib/sets/lists/base/rescue.vax: file removal
distrib/amd64/uefi-installimage/Makefile.bootimage: revision 1.12
usr.sbin/sysinst/arch/evbmips/md.h: revision 1.3
distrib/sets/lists/base/rescue.mi: file removal
distrib/sets/README: revision 1.14
usr.sbin/sysinst/arch/sgimips/md.h: revision 1.4
distrib/sets/lists/base/rescue.sparc64: file removal
distrib/sets/lists/base/rescue.mi: revision 1.45
distrib/sets/lists/base/rescue.mi: revision 1.46
usr.sbin/sysinst/arch/ofppc/md.h: revision 1.4
usr.sbin/sysinst/arch/cobalt/md.h: revision 1.4
distrib/sets/lists/base/rescue.ad.arm: file removal
distrib/sets/lists/base/rescue.mac68k: file removal
usr.sbin/sysinst/defs.h: revision 1.45
usr.sbin/sysinst/arch/landisk/md.h: revision 1.2
distrib/notes/atari/xfer: revision 1.17
etc/Makefile: revision 1.441
usr.sbin/sysinst/msg.mi.en: revision 1.22
distrib/sun2/MakeInstTape: revision 1.2
Remove ldconfig from /rescue, and mark it MI obsolete.
- ldconfig in netbsd refers to a.out binaries only. We've been ELF-only
since NetBSD 2.0 or so, and having it in /rescue served little purpose
even before that, as /rescue is standalone.
- Using MI obsolete to avoid the need for MD set lists where ldconfig
is the sole entry
Mark /rescue/edlabel as MI-obsolete, so we can remove all remaining MD
rescue set list files.
Split out /rescue to its own set and adapt installers/images to add it.
This is meant to make updates safer: if something goes wrong with updating
base, we still have the old, standalone /rescue to recover from.
Diffstat (limited to 'usr.sbin')
35 files changed, 82 insertions, 64 deletions
diff --git a/usr.sbin/sysinst/arch/acorn32/md.h b/usr.sbin/sysinst/arch/acorn32/md.h index a9e3229b63a..441358e0dbf 100644 --- a/usr.sbin/sysinst/arch/acorn32/md.h +++ b/usr.sbin/sysinst/arch/acorn32/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:45 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:35 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -52,7 +52,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" diff --git a/usr.sbin/sysinst/arch/amd64/md.h b/usr.sbin/sysinst/arch/amd64/md.h index d7eca1dc5b7..430a2f8c9e3 100644 --- a/usr.sbin/sysinst/arch/amd64/md.h +++ b/usr.sbin/sysinst/arch/amd64/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.6 2019/07/14 11:27:33 martin Exp $ */ +/* $NetBSD: md.h,v 1.6.2.1 2019/11/17 07:04:37 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -76,7 +76,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver * * x86_64 has the MD set kern first, because generic kernels are too * big to fit on install floppies. diff --git a/usr.sbin/sysinst/arch/amiga/md.h b/usr.sbin/sysinst/arch/amiga/md.h index bba381d14c7..f3058de547c 100644 --- a/usr.sbin/sysinst/arch/amiga/md.h +++ b/usr.sbin/sysinst/arch/amiga/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2018/11/18 10:34:45 martin Exp $ */ +/* $NetBSD: md.h,v 1.3.2.1 2019/11/17 07:04:36 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -51,7 +51,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" diff --git a/usr.sbin/sysinst/arch/arc/md.h b/usr.sbin/sysinst/arch/arc/md.h index e4c14c7dc2a..d83244f6378 100644 --- a/usr.sbin/sysinst/arch/arc/md.h +++ b/usr.sbin/sysinst/arch/arc/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/06/12 06:20:18 martin Exp $ */ +/* $NetBSD: md.h,v 1.3.2.1 2019/11/17 07:04:35 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -72,7 +72,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS diff --git a/usr.sbin/sysinst/arch/atari/md.h b/usr.sbin/sysinst/arch/atari/md.h index dff34a9598c..46c293bfa45 100644 --- a/usr.sbin/sysinst/arch/atari/md.h +++ b/usr.sbin/sysinst/arch/atari/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:03 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -58,7 +58,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-ATARITT" #define SET_KERNEL_2_NAME "kern-FALCON" diff --git a/usr.sbin/sysinst/arch/bebox/md.h b/usr.sbin/sysinst/arch/bebox/md.h index 102c819c9e8..ed03f50f7df 100644 --- a/usr.sbin/sysinst/arch/bebox/md.h +++ b/usr.sbin/sysinst/arch/bebox/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:45 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:35 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,7 +49,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" diff --git a/usr.sbin/sysinst/arch/cats/md.h b/usr.sbin/sysinst/arch/cats/md.h index 01a240c3f41..1d4ae1063f5 100644 --- a/usr.sbin/sysinst/arch/cats/md.h +++ b/usr.sbin/sysinst/arch/cats/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2018/11/18 10:37:04 martin Exp $ */ +/* $NetBSD: md.h,v 1.3.2.1 2019/11/17 07:04:37 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -46,7 +46,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define SET_KERNEL_2_NAME "kern-GENERIC.ABLE" diff --git a/usr.sbin/sysinst/arch/cobalt/md.h b/usr.sbin/sysinst/arch/cobalt/md.h index 9d009fa68bc..9773d419a75 100644 --- a/usr.sbin/sysinst/arch/cobalt/md.h +++ b/usr.sbin/sysinst/arch/cobalt/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/06/12 06:20:19 martin Exp $ */ +/* $NetBSD: md.h,v 1.3.2.1 2019/11/17 07:04:38 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -69,7 +69,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define MD_SETS_SELECTED SET_KERNEL_1, SET_SYSTEM, SET_X11_NOSERVERS diff --git a/usr.sbin/sysinst/arch/emips/md.h b/usr.sbin/sysinst/arch/emips/md.h index 99a5c3a5640..70f843d6006 100644 --- a/usr.sbin/sysinst/arch/emips/md.h +++ b/usr.sbin/sysinst/arch/emips/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2018/11/16 19:54:03 martin Exp $ */ +/* $NetBSD: md.h,v 1.4.2.1 2019/11/17 07:04:36 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -72,7 +72,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define MD_SETS_VALID SET_KERNEL, SET_SYSTEM, SET_X11_NOSERVERS diff --git a/usr.sbin/sysinst/arch/evbarm/md.h b/usr.sbin/sysinst/arch/evbarm/md.h index 25d2ae589b7..67b1513e416 100644 --- a/usr.sbin/sysinst/arch/evbarm/md.h +++ b/usr.sbin/sysinst/arch/evbarm/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2019/06/12 06:20:19 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:37 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -50,7 +50,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-ADI_BRH" #define SET_KERNEL_2_NAME "kern-INTEGRATOR" diff --git a/usr.sbin/sysinst/arch/evbmips/md.h b/usr.sbin/sysinst/arch/evbmips/md.h index a6e80de8cfe..03f0c0ff698 100644 --- a/usr.sbin/sysinst/arch/evbmips/md.h +++ b/usr.sbin/sysinst/arch/evbmips/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2017/08/09 23:01:06 maya Exp $ */ +/* $NetBSD: md.h,v 1.2.6.1 2019/11/17 07:04:37 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -47,7 +47,7 @@ /* * Default filesets to fetch and install during installation or upgrade. - * The standard sets are: base etc comp games man misc tests text + * The standard sets are: base etc comp games man misc rescue tests text */ #if defined(ARCH_mipsel) || defined(ARCH_mipseb) diff --git a/usr.sbin/sysinst/arch/evbppc/md.h b/usr.sbin/sysinst/arch/evbppc/md.h index 17b5657b3f3..6ae440fea39 100644 --- a/usr.sbin/sysinst/arch/evbppc/md.h +++ b/usr.sbin/sysinst/arch/evbppc/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:46 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:33 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -50,7 +50,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" diff --git a/usr.sbin/sysinst/arch/hp300/md.h b/usr.sbin/sysinst/arch/hp300/md.h index 26fb3c9cbc5..b849b325c88 100644 --- a/usr.sbin/sysinst/arch/hp300/md.h +++ b/usr.sbin/sysinst/arch/hp300/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2019/06/12 06:20:20 martin Exp $ */ +/* $NetBSD: md.h,v 1.4.2.1 2019/11/17 07:04:37 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -60,7 +60,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" diff --git a/usr.sbin/sysinst/arch/hpcarm/md.h b/usr.sbin/sysinst/arch/hpcarm/md.h index 6541c356d42..99a696e3993 100644 --- a/usr.sbin/sysinst/arch/hpcarm/md.h +++ b/usr.sbin/sysinst/arch/hpcarm/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:46 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:33 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -62,7 +62,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-IPAQ" #define SET_KERNEL_2_NAME "kern-JORNADA720" diff --git a/usr.sbin/sysinst/arch/hpcmips/md.h b/usr.sbin/sysinst/arch/hpcmips/md.h index d9a50fe9e2b..0ce98572edd 100644 --- a/usr.sbin/sysinst/arch/hpcmips/md.h +++ b/usr.sbin/sysinst/arch/hpcmips/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:46 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:35 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -60,7 +60,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define SET_KERNEL_2_NAME "kern-TX3912" diff --git a/usr.sbin/sysinst/arch/hpcsh/md.h b/usr.sbin/sysinst/arch/hpcsh/md.h index 4a658634045..8103ac3edaa 100644 --- a/usr.sbin/sysinst/arch/hpcsh/md.h +++ b/usr.sbin/sysinst/arch/hpcsh/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:45 dholland Exp $ */ +/* $NetBSD: md.h,v 1.1.30.1 2019/11/17 07:04:35 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -54,7 +54,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define SET_KERNEL_2_NAME "kern-HPW650PA" diff --git a/usr.sbin/sysinst/arch/i386/md.h b/usr.sbin/sysinst/arch/i386/md.h index c608e086784..20972c6c96c 100644 --- a/usr.sbin/sysinst/arch/i386/md.h +++ b/usr.sbin/sysinst/arch/i386/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.6 2019/07/14 11:27:33 martin Exp $ */ +/* $NetBSD: md.h,v 1.6.2.1 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -76,7 +76,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_GENERIC SET_KERNEL_1 diff --git a/usr.sbin/sysinst/arch/landisk/md.h b/usr.sbin/sysinst/arch/landisk/md.h index ae66603b31f..3f0fa714464 100644 --- a/usr.sbin/sysinst/arch/landisk/md.h +++ b/usr.sbin/sysinst/arch/landisk/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.1.30.1 2019/11/17 07:04:38 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -53,7 +53,7 @@ /* * Default filesets to fetch and install during installation or upgrade. - * The standard sets are: base etc comp games man misc text + * The standard sets are: base etc comp games man misc rescue tests text */ #define SET_KERNEL_1_NAME "kern-GENERIC" diff --git a/usr.sbin/sysinst/arch/mvme68k/md.h b/usr.sbin/sysinst/arch/mvme68k/md.h index 975ad657d67..259669baf5b 100644 --- a/usr.sbin/sysinst/arch/mvme68k/md.h +++ b/usr.sbin/sysinst/arch/mvme68k/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:33 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -64,7 +64,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define MD_SETS_VALID SET_KERNEL, SET_SYSTEM, SET_X11_NOSERVERS diff --git a/usr.sbin/sysinst/arch/ofppc/md.h b/usr.sbin/sysinst/arch/ofppc/md.h index 81639f7f5aa..a8bf8f29154 100644 --- a/usr.sbin/sysinst/arch/ofppc/md.h +++ b/usr.sbin/sysinst/arch/ofppc/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/06/12 06:20:22 martin Exp $ */ +/* $NetBSD: md.h,v 1.3.2.1 2019/11/17 07:04:38 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -79,7 +79,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver * * 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. diff --git a/usr.sbin/sysinst/arch/playstation2/md.h b/usr.sbin/sysinst/arch/playstation2/md.h index b281623a412..67e05def77b 100644 --- a/usr.sbin/sysinst/arch/playstation2/md.h +++ b/usr.sbin/sysinst/arch/playstation2/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.1.30.1 2019/11/17 07:04:33 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -62,7 +62,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base, etc, comp, games, man, misc, tests, text + * base, etc, comp, games, man, misc, rescue, tests, text */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define MD_SETS_VALID SET_KERNEL, SET_SYSTEM diff --git a/usr.sbin/sysinst/arch/pmax/md.h b/usr.sbin/sysinst/arch/pmax/md.h index 7aa525e9840..26032035824 100644 --- a/usr.sbin/sysinst/arch/pmax/md.h +++ b/usr.sbin/sysinst/arch/pmax/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2018/11/16 19:54:04 martin Exp $ */ +/* $NetBSD: md.h,v 1.3.2.1 2019/11/17 07:04:36 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -72,7 +72,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define SET_KERNEL_2_NAME "kern-GENERIC_USB" diff --git a/usr.sbin/sysinst/arch/prep/md.h b/usr.sbin/sysinst/arch/prep/md.h index cd8e659df50..2dc659fdd08 100644 --- a/usr.sbin/sysinst/arch/prep/md.h +++ b/usr.sbin/sysinst/arch/prep/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/06/12 06:20:22 martin Exp $ */ +/* $NetBSD: md.h,v 1.3.2.1 2019/11/17 07:04:37 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -61,7 +61,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" diff --git a/usr.sbin/sysinst/arch/sandpoint/md.h b/usr.sbin/sysinst/arch/sandpoint/md.h index 59fb8cce8c3..23a522f1ad3 100644 --- a/usr.sbin/sysinst/arch/sandpoint/md.h +++ b/usr.sbin/sysinst/arch/sandpoint/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:46 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:33 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -54,7 +54,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define SET_KERNEL_2_NAME "kern-KUROBOX" diff --git a/usr.sbin/sysinst/arch/sgimips/md.h b/usr.sbin/sysinst/arch/sgimips/md.h index ebd96f5270a..62148ed6a06 100644 --- a/usr.sbin/sysinst/arch/sgimips/md.h +++ b/usr.sbin/sysinst/arch/sgimips/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/06/12 06:20:22 martin Exp $ */ +/* $NetBSD: md.h,v 1.3.2.1 2019/11/17 07:04:37 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -66,7 +66,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC32_IP2x" #define SET_KERNEL_2_NAME "kern-GENERIC32_IP3x" diff --git a/usr.sbin/sysinst/arch/shark/md.h b/usr.sbin/sysinst/arch/shark/md.h index 592b0a957f1..029c5730272 100644 --- a/usr.sbin/sysinst/arch/shark/md.h +++ b/usr.sbin/sysinst/arch/shark/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:46 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:36 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -48,7 +48,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_1_NAME "kern-GENERIC" diff --git a/usr.sbin/sysinst/arch/x68k/md.h b/usr.sbin/sysinst/arch/x68k/md.h index 6b78c2539bb..49ca21efd84 100644 --- a/usr.sbin/sysinst/arch/x68k/md.h +++ b/usr.sbin/sysinst/arch/x68k/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:05 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:35 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -67,7 +67,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver * * x68k 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. diff --git a/usr.sbin/sysinst/arch/zaurus/md.h b/usr.sbin/sysinst/arch/zaurus/md.h index 6cb4b2bda3d..894c7812c29 100644 --- a/usr.sbin/sysinst/arch/zaurus/md.h +++ b/usr.sbin/sysinst/arch/zaurus/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:46 martin Exp $ */ +/* $NetBSD: md.h,v 1.2.2.1 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -60,7 +60,7 @@ /* * Default filesets to fetch and install during installation * or upgrade. The standard sets are: - * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver */ #define SET_KERNEL_GENERIC SET_KERNEL_1 #define SET_KERNEL_C700 SET_KERNEL_2 diff --git a/usr.sbin/sysinst/defs.h b/usr.sbin/sysinst/defs.h index f3fdeade79f..7e474fd6718 100644 --- a/usr.sbin/sysinst/defs.h +++ b/usr.sbin/sysinst/defs.h @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.42.2.2 2019/08/28 10:00:53 msaitoh Exp $ */ +/* $NetBSD: defs.h,v 1.42.2.3 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -117,6 +117,7 @@ enum { SET_MAN_PAGES, /* online manual pages */ SET_MISC, /* miscellaneuous */ SET_MODULES, /* kernel modules */ + SET_RESCUE, /* /rescue recovery tools */ SET_TESTS, /* tests */ SET_TEXT_TOOLS, /* text processing tools */ @@ -160,7 +161,8 @@ enum { #define SET_CORE SET_MODULES, SET_BASE, SET_ETC /* All system sets */ #define SET_SYSTEM SET_CORE, SET_COMPILER, SET_GAMES, \ - SET_MAN_PAGES, SET_MISC, SET_TESTS, SET_TEXT_TOOLS + SET_MAN_PAGES, SET_MISC, SET_RESCUE, \ + SET_TESTS, SET_TEXT_TOOLS /* All X11 sets */ #define SET_X11_NOSERVERS SET_X11_BASE, SET_X11_FONTS, SET_X11_PROG, SET_X11_ETC #define SET_X11 SET_X11_NOSERVERS, SET_X11_SERVERS diff --git a/usr.sbin/sysinst/msg.mi.de b/usr.sbin/sysinst/msg.mi.de index ef0c83701a9..06cdc647961 100644 --- a/usr.sbin/sysinst/msg.mi.de +++ b/usr.sbin/sysinst/msg.mi.de @@ -1,4 +1,4 @@ -/* $NetBSD: msg.mi.de,v 1.13.2.2 2019/08/18 13:25:21 msaitoh Exp $ */ +/* $NetBSD: msg.mi.de,v 1.13.2.3 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -869,6 +869,9 @@ message set_misc message set_modules {Kernel Modules} +message set_rescue +{Recovery tools} + message set_tests {Testprogramme} diff --git a/usr.sbin/sysinst/msg.mi.en b/usr.sbin/sysinst/msg.mi.en index c2438b585f9..324c7ab5736 100644 --- a/usr.sbin/sysinst/msg.mi.en +++ b/usr.sbin/sysinst/msg.mi.en @@ -1,4 +1,4 @@ -/* $NetBSD: msg.mi.en,v 1.19.2.3 2019/10/23 06:01:55 msaitoh Exp $ */ +/* $NetBSD: msg.mi.en,v 1.19.2.4 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -806,6 +806,9 @@ message set_misc message set_modules {Kernel modules} +message set_rescue +{Recovery tools} + message set_tests {Test programs} diff --git a/usr.sbin/sysinst/msg.mi.es b/usr.sbin/sysinst/msg.mi.es index 1872c66a131..a37f33cd15a 100644 --- a/usr.sbin/sysinst/msg.mi.es +++ b/usr.sbin/sysinst/msg.mi.es @@ -1,4 +1,4 @@ -/* $NetBSD: msg.mi.es,v 1.14.2.2 2019/08/18 13:25:21 msaitoh Exp $ */ +/* $NetBSD: msg.mi.es,v 1.14.2.3 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -831,6 +831,9 @@ message set_misc message set_modules {Kernel Modules} +message set_rescue +{Recovery tools} + message set_tests {Programas de prueba} diff --git a/usr.sbin/sysinst/msg.mi.fr b/usr.sbin/sysinst/msg.mi.fr index c5e29d6c8d5..95f81e71744 100644 --- a/usr.sbin/sysinst/msg.mi.fr +++ b/usr.sbin/sysinst/msg.mi.fr @@ -1,4 +1,4 @@ -/* $NetBSD: msg.mi.fr,v 1.17.2.3 2019/10/23 06:01:55 msaitoh Exp $ */ +/* $NetBSD: msg.mi.fr,v 1.17.2.4 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -879,6 +879,9 @@ message set_misc message set_modules {Modules du noyau} +message set_rescue +{Recovery tools} + message set_tests {Programmes de test} diff --git a/usr.sbin/sysinst/msg.mi.pl b/usr.sbin/sysinst/msg.mi.pl index 4fa22c2d288..a7c68b22590 100644 --- a/usr.sbin/sysinst/msg.mi.pl +++ b/usr.sbin/sysinst/msg.mi.pl @@ -1,4 +1,4 @@ -/* $NetBSD: msg.mi.pl,v 1.20.2.3 2019/10/24 16:27:21 martin Exp $ */ +/* $NetBSD: msg.mi.pl,v 1.20.2.4 2019/11/17 07:04:34 martin Exp $ */ /* Based on english version: */ /* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */ @@ -805,6 +805,9 @@ message set_misc message set_modules {Moduly kernela} +message set_rescue +{Recovery tools} + message set_tests {Programy testujace} diff --git a/usr.sbin/sysinst/util.c b/usr.sbin/sysinst/util.c index 1f46890b94f..a2a1d33a0a9 100644 --- a/usr.sbin/sysinst/util.c +++ b/usr.sbin/sysinst/util.c @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.29.2.3 2019/08/28 10:00:53 msaitoh Exp $ */ +/* $NetBSD: util.c,v 1.29.2.4 2019/11/17 07:04:34 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -117,6 +117,7 @@ distinfo dist_list[] = { {"games", SET_GAMES, false, MSG_set_games, NULL}, {"man", SET_MAN_PAGES, false, MSG_set_man_pages, NULL}, {"misc", SET_MISC, false, MSG_set_misc, NULL}, + {"rescue", SET_RESCUE, false, MSG_set_rescue, NULL}, {"tests", SET_TESTS, false, MSG_set_tests, NULL}, {"text", SET_TEXT_TOOLS, false, MSG_set_text_tools, NULL}, |
