Module Name: src
Committed By: martin
Date: Sun Nov 17 07:04:38 UTC 2019
Modified Files:
src/distrib/amd64/uefi-installimage [netbsd-9]: Makefile.bootimage
src/distrib/common/bootimage [netbsd-9]: Makefile.bootimage
src/distrib/miniroot [netbsd-9]: install.sub
src/distrib/notes/atari [netbsd-9]: xfer
src/distrib/notes/mvme68k [netbsd-9]: xfer
src/distrib/sets [netbsd-9]: README maketars regpkgset sets.subr
src/distrib/sun2 [netbsd-9]: MakeInstTape
src/distrib/sun3 [netbsd-9]: MakeInstTape
src/distrib/utils/embedded [netbsd-9]: mkimage
src/etc [netbsd-9]: Makefile
src/rescue [netbsd-9]: Makefile
src/usr.sbin/sysinst [netbsd-9]: defs.h msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl util.c
src/usr.sbin/sysinst/arch/acorn32 [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/amd64 [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/amiga [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/arc [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/atari [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/bebox [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/cats [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/cobalt [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/emips [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/evbarm [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/evbmips [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/evbppc [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/hp300 [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/hpcarm [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/hpcmips [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/hpcsh [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/i386 [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/landisk [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/mvme68k [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/ofppc [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/playstation2 [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/pmax [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/prep [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/sandpoint [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/sgimips [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/shark [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/x68k [netbsd-9]: md.h
src/usr.sbin/sysinst/arch/zaurus [netbsd-9]: md.h
Removed Files:
src/distrib/sets/lists/base [netbsd-9]: rescue.ad.arm rescue.ad.m68k
rescue.ad.m68k.shl rescue.i386 rescue.mac68k rescue.macppc
rescue.mi rescue.shark rescue.sparc rescue.sparc64 rescue.sun2
rescue.vax
src/rescue [netbsd-9]: list.ldconfig
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.2.1 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.21 -r1.21.2.1 \
src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.48 -r1.48.2.1 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.16 -r1.16.64.1 src/distrib/notes/atari/xfer
cvs rdiff -u -r1.18 -r1.18.18.1 src/distrib/notes/mvme68k/xfer
cvs rdiff -u -r1.13 -r1.13.28.1 src/distrib/sets/README
cvs rdiff -u -r1.89 -r1.89.2.1 src/distrib/sets/maketars
cvs rdiff -u -r1.12 -r1.12.50.1 src/distrib/sets/regpkgset
cvs rdiff -u -r1.186 -r1.186.2.1 src/distrib/sets/sets.subr
cvs rdiff -u -r1.3 -r0 src/distrib/sets/lists/base/rescue.ad.arm \
src/distrib/sets/lists/base/rescue.ad.m68k.shl \
src/distrib/sets/lists/base/rescue.mac68k \
src/distrib/sets/lists/base/rescue.shark \
src/distrib/sets/lists/base/rescue.vax
cvs rdiff -u -r1.4 -r0 src/distrib/sets/lists/base/rescue.ad.m68k \
src/distrib/sets/lists/base/rescue.i386 \
src/distrib/sets/lists/base/rescue.macppc \
src/distrib/sets/lists/base/rescue.sparc64 \
src/distrib/sets/lists/base/rescue.sun2
cvs rdiff -u -r1.44 -r0 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.5 -r0 src/distrib/sets/lists/base/rescue.sparc
cvs rdiff -u -r1.1 -r1.1.104.1 src/distrib/sun2/MakeInstTape
cvs rdiff -u -r1.2 -r1.2.116.1 src/distrib/sun3/MakeInstTape
cvs rdiff -u -r1.69 -r1.69.6.1 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.438.2.1 -r1.438.2.2 src/etc/Makefile
cvs rdiff -u -r1.37 -r1.37.2.1 src/rescue/Makefile
cvs rdiff -u -r1.1 -r0 src/rescue/list.ldconfig
cvs rdiff -u -r1.42.2.2 -r1.42.2.3 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.19.2.3 -r1.19.2.4 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.17.2.3 -r1.17.2.4 src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.20.2.3 -r1.20.2.4 src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.29.2.3 -r1.29.2.4 src/usr.sbin/sysinst/util.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/acorn32/md.h
cvs rdiff -u -r1.6 -r1.6.2.1 src/usr.sbin/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/amiga/md.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/arc/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/atari/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/bebox/md.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/cats/md.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/cobalt/md.h
cvs rdiff -u -r1.4 -r1.4.2.1 src/usr.sbin/sysinst/arch/emips/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/evbarm/md.h
cvs rdiff -u -r1.2 -r1.2.6.1 src/usr.sbin/sysinst/arch/evbmips/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/evbppc/md.h
cvs rdiff -u -r1.4 -r1.4.2.1 src/usr.sbin/sysinst/arch/hp300/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/hpcarm/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/hpcmips/md.h
cvs rdiff -u -r1.1 -r1.1.30.1 src/usr.sbin/sysinst/arch/hpcsh/md.h
cvs rdiff -u -r1.6 -r1.6.2.1 src/usr.sbin/sysinst/arch/i386/md.h
cvs rdiff -u -r1.1 -r1.1.30.1 src/usr.sbin/sysinst/arch/landisk/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/mvme68k/md.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/ofppc/md.h
cvs rdiff -u -r1.1 -r1.1.30.1 src/usr.sbin/sysinst/arch/playstation2/md.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/pmax/md.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/prep/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/sandpoint/md.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/sgimips/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/shark/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/x68k/md.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/arch/zaurus/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.11 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.11.2.1
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.11 Fri Feb 22 22:20:18 2019
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Sun Nov 17 07:04:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.11 2019/02/22 22:20:18 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.11.2.1 2019/11/17 07:04:37 martin Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -68,8 +68,8 @@
# (default: kern-GENERIC)
# SETS
# binary sets that should be extracted into image
-# (default: modules base etc comp games man misc tests text
-# xbase xcomp xetc xfont xserver)
+# (default: modules base etc comp games man misc rescue tests
+# text xbase xcomp xetc xfont xserver)
# SETS_DIR
# directory path where binary sets are stored
# (default: ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets)
@@ -218,7 +218,7 @@ SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESST
#
# definitions to create root fs
#
-SETS_DEFAULT= modules base etc comp games man misc tests text
+SETS_DEFAULT= modules base etc comp games man misc rescue tests text
.if ${MKX11} != "no"
SETS_DEFAULT+= xbase xcomp xetc xfont xserver
.endif
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.21 src/distrib/common/bootimage/Makefile.bootimage:1.21.2.1
--- src/distrib/common/bootimage/Makefile.bootimage:1.21 Fri Feb 22 22:13:58 2019
+++ src/distrib/common/bootimage/Makefile.bootimage Sun Nov 17 07:04:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.21 2019/02/22 22:13:58 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.21.2.1 2019/11/17 07:04:34 martin Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -62,8 +62,8 @@
# (default: kern-GENERIC)
# SETS
# binary sets that should be extracted into image
-# (default: modules base etc comp games man misc tests text
-# xbase xcomp xetc xfont xserver)
+# (default: modules base etc comp games man misc rescue tests
+# text xbase xcomp xetc xfont xserver)
# SETS_DIR
# directory path where binary sets are stored
# (default: ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets)
@@ -192,7 +192,7 @@ SWAPCYLINDERS!= expr ${SWAPSECTORS} / \(
#
# definitions to create root fs
#
-SETS_DEFAULT= modules base etc comp games man misc tests text
+SETS_DEFAULT= modules base etc comp games man misc rescue tests text
.if ${MKX11} != "no"
SETS_DEFAULT+= xbase xcomp xetc xfont xserver
.endif
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.48 src/distrib/miniroot/install.sub:1.48.2.1
--- src/distrib/miniroot/install.sub:1.48 Wed Apr 10 14:52:53 2019
+++ src/distrib/miniroot/install.sub Sun Nov 17 07:04:35 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.48 2019/04/10 14:52:53 christos Exp $
+# $NetBSD: install.sub,v 1.48.2.1 2019/11/17 07:04:35 martin Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,9 +35,9 @@ ROOTDISK="" # filled in below
VERSION=89936
export VERSION
-ALLSETS="base comp etc games man misc text" # default install sets
-UPGRSETS="base comp games man misc text" # default upgrade sets
-THESETS= # one of the above
+ALLSETS="base comp etc games man misc rescue text" # default install sets
+UPGRSETS="base comp games man misc text" # default upgrade sets
+THESETS= # one of the above
local_sets_dir="" # Path searched for sets by install_sets
# on the local filesystems
Index: src/distrib/notes/atari/xfer
diff -u src/distrib/notes/atari/xfer:1.16 src/distrib/notes/atari/xfer:1.16.64.1
--- src/distrib/notes/atari/xfer:1.16 Sat Sep 6 21:39:24 2008
+++ src/distrib/notes/atari/xfer Sun Nov 17 07:04:38 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: xfer,v 1.16 2008/09/06 21:39:24 tsutsui Exp $
+.\" $NetBSD: xfer,v 1.16.64.1 2019/11/17 07:04:38 martin Exp $
.
Installation is supported from several media types, including:
.Pp
@@ -92,7 +92,7 @@ system, you can create it as follows:
.Dl # Ic "cd .../NetBSD-\*V/\*M/binary/sets"
.Dl # Ic "T=\*[Lt]tape_device\*[Gt]"
.Dl # Ic "mt -f $T rewind"
-.Dl # Ic "for f in base etc comp games man misc text"
+.Dl # Ic "for f in base etc comp games man misc rescue text"
.Dl Ic "\ \ \ \ dd if=$f.tgz of=$T conv=osync bs=5k"
.Dl # Ic "done"
.Dl # Ic "mt -f $T rewind"
Index: src/distrib/notes/mvme68k/xfer
diff -u src/distrib/notes/mvme68k/xfer:1.18 src/distrib/notes/mvme68k/xfer:1.18.18.1
--- src/distrib/notes/mvme68k/xfer:1.18 Fri Oct 17 21:48:38 2014
+++ src/distrib/notes/mvme68k/xfer Sun Nov 17 07:04:34 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: xfer,v 1.18 2014/10/17 21:48:38 snj Exp $
+.\" $NetBSD: xfer,v 1.18.18.1 2019/11/17 07:04:34 martin Exp $
.
Installation is supported from several media types, including:
.(bullet
@@ -52,7 +52,7 @@ The installation set tape is created as
.Dl # Ic "cd .../NetBSD-\*V/\*M/binary/sets"
.Dl # Ic "set T = /dev/nrst0"
.Dl # Ic "mt -f $T rewind"
-.Dl # Ic "for f in base etc comp games man misc text; do"
+.Dl # Ic "for f in base etc comp games man misc rescue text; do"
.Dl Ic "\ \ \ \ gzip -d \*[Lt] $f.tgz | dd of=$T bs=8k conv=osync"
.Dl # Ic "done"
.Dl # Ic "mt -f $T rewind"
Index: src/distrib/sets/README
diff -u src/distrib/sets/README:1.13 src/distrib/sets/README:1.13.28.1
--- src/distrib/sets/README:1.13 Tue Aug 6 22:33:59 2013
+++ src/distrib/sets/README Sun Nov 17 07:04:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: README,v 1.13 2013/08/06 22:33:59 soren Exp $
+# $NetBSD: README,v 1.13.28.1 2019/11/17 07:04:33 martin Exp $
the scripts should be run from the directory where they reside.
@@ -62,6 +62,8 @@ the sets are as follows:
modules: stand/${MACHINE}/${OSRELEASE}/modules kernel modules
+ rescue: Standalone system recovery tools.
+
tests: unit, regression, integration and stress tests for the
whole system.
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.89 src/distrib/sets/maketars:1.89.2.1
--- src/distrib/sets/maketars:1.89 Fri Sep 28 15:04:20 2018
+++ src/distrib/sets/maketars Sun Nov 17 07:04:33 2019
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.89 2018/09/28 15:04:20 martin Exp $
+# $NetBSD: maketars,v 1.89.2.1 2019/11/17 07:04:33 martin Exp $
#
# Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
# [-M metalog] [-N etcdir] [-F setlistsdir] [-d destdir]
# [-t tardir] [-U] [setname ...]
#
-# The default sets are "base comp debug etc games man misc tests text"
+# The default sets are "base comp debug etc games man misc rescue tests text"
# The X sets are "xbase xcomp xdebug xetc xfont xserver"
# The extsrc sets are "extbase extcomp extetc"
#
Index: src/distrib/sets/regpkgset
diff -u src/distrib/sets/regpkgset:1.12 src/distrib/sets/regpkgset:1.12.50.1
--- src/distrib/sets/regpkgset:1.12 Tue Dec 1 15:49:21 2009
+++ src/distrib/sets/regpkgset Sun Nov 17 07:04:33 2019
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: regpkgset,v 1.12 2009/12/01 15:49:21 apb Exp $
+# $NetBSD: regpkgset,v 1.12.50.1 2019/11/17 07:04:33 martin Exp $
#
# Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -123,7 +123,7 @@ if [ $# -lt 1 ]; then
fi
case "$1" in
-all) list="base comp etc games man misc tests text" ;;
+all) list="base comp etc games man misc rescue tests text" ;;
*) list="$*" ;;
esac
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.186 src/distrib/sets/sets.subr:1.186.2.1
--- src/distrib/sets/sets.subr:1.186 Tue Apr 16 21:20:51 2019
+++ src/distrib/sets/sets.subr Sun Nov 17 07:04:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.186 2019/04/16 21:20:51 mrg Exp $
+# $NetBSD: sets.subr,v 1.186.2.1 2019/11/17 07:04:33 martin Exp $
#
#
@@ -163,7 +163,7 @@ stlib=$shlib
if [ "${MKPIC}" = "no" ]; then
shlib=no
fi
-nlists="base comp $debugset etc games man misc $modset $testset text"
+nlists="base comp $debugset etc games man misc $modset rescue $testset text"
xlists="xbase xcomp $xdebugset xetc xfont xserver"
extlists="extbase extcomp extetc"
@@ -180,7 +180,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.186 2019/04/16 21:20:51 mrg Exp $
+# # $NetBSD: sets.subr,v 1.186.2.1 2019/11/17 07:04:33 martin Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Index: src/distrib/sun2/MakeInstTape
diff -u src/distrib/sun2/MakeInstTape:1.1 src/distrib/sun2/MakeInstTape:1.1.104.1
--- src/distrib/sun2/MakeInstTape:1.1 Fri May 18 00:16:38 2001
+++ src/distrib/sun2/MakeInstTape Sun Nov 17 07:04:38 2019
@@ -3,12 +3,12 @@
# Here is a generic script that makes a Sun2 boot tape using
# the files in ../binary
#
-# $NetBSD: MakeInstTape,v 1.1 2001/05/18 00:16:38 fredette Exp $
+# $NetBSD: MakeInstTape,v 1.1.104.1 2019/11/17 07:04:38 martin Exp $
T=${1:-/dev/nrst0}
# Remember, skip "etc" for an upgrade.
-sets="etc base comp games man misc text"
+sets="etc base comp games man misc rescue text"
# Entertain...
set -x
Index: src/distrib/sun3/MakeInstTape
diff -u src/distrib/sun3/MakeInstTape:1.2 src/distrib/sun3/MakeInstTape:1.2.116.1
--- src/distrib/sun3/MakeInstTape:1.2 Sat Dec 20 02:52:54 1997
+++ src/distrib/sun3/MakeInstTape Sun Nov 17 07:04:34 2019
@@ -3,12 +3,12 @@
# Here is a generic script that makes a Sun3 boot tape using
# the files in ../binary
#
-# $NetBSD: MakeInstTape,v 1.2 1997/12/20 02:52:54 gwr Exp $
+# $NetBSD: MakeInstTape,v 1.2.116.1 2019/11/17 07:04:34 martin Exp $
T=${1:-/dev/nrst0}
# Remember, skip "etc" for an upgrade.
-sets="etc base comp games man misc text"
+sets="etc base comp games man misc rescue text"
# Entertain...
set -x
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.69 src/distrib/utils/embedded/mkimage:1.69.6.1
--- src/distrib/utils/embedded/mkimage:1.69 Tue Nov 28 02:56:44 2017
+++ src/distrib/utils/embedded/mkimage Sun Nov 17 07:04:36 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.69 2017/11/28 02:56:44 kre Exp $
+# $NetBSD: mkimage,v 1.69.6.1 2019/11/17 07:04:36 martin Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -61,7 +61,7 @@ MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE:-mkuboo
GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
src="/usr/src"
-sets="base comp etc games man misc modules tests text"
+sets="base comp etc games man misc modules rescue tests text"
xsets="xbase xcomp xetc xfont xserver"
minfree="10%"
bar="==="
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.438.2.1 src/etc/Makefile:1.438.2.2
--- src/etc/Makefile:1.438.2.1 Wed Aug 7 10:18:13 2019
+++ src/etc/Makefile Sun Nov 17 07:04:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.438.2.1 2019/08/07 10:18:13 martin Exp $
+# $NetBSD: Makefile,v 1.438.2.2 2019/11/17 07:04:38 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -370,7 +370,7 @@ install-etc-files: .PHONY .MAKE check_DE
# Install var/db/obsolete set lists; this is performed by "make build"
#
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
-OBSOLETE.files= base comp etc games man misc text
+OBSOLETE.files= base comp etc games man misc rescue text
.if ${MKDEBUG} != "no"
OBSOLETE.files+= debug
.endif
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.37 src/rescue/Makefile:1.37.2.1
--- src/rescue/Makefile:1.37 Sun Jan 27 04:42:46 2019
+++ src/rescue/Makefile Sun Nov 17 07:04:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/01/27 04:42:46 dholland Exp $
+# $NetBSD: Makefile,v 1.37.2.1 2019/11/17 07:04:35 martin Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
@@ -27,13 +27,6 @@ LISTS= ${.CURDIR}/list
TARGETDIR= ${DESTDIR}/rescue
PARSELISTENV+= TARGETDIR=${TARGETDIR:Q}
-.for f in ldconfig
-PROG_${f}!= cd ${NETBSDSRCDIR}/sbin/${f} && ${MAKE} -V PROG
-.if (${PROG_${f}} != "")
-LISTS+= ${.CURDIR}/list.${f}
-.endif
-.endfor
-
.for f in pdisk
PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f}/bin && ${MAKE} -V PROG
.if (${PROG_${f}} != "")
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.42.2.2 src/usr.sbin/sysinst/defs.h:1.42.2.3
--- src/usr.sbin/sysinst/defs.h:1.42.2.2 Wed Aug 28 10:00:53 2019
+++ src/usr.sbin/sysinst/defs.h Sun Nov 17 07:04:34 2019
@@ -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
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.13.2.2 src/usr.sbin/sysinst/msg.mi.de:1.13.2.3
--- src/usr.sbin/sysinst/msg.mi.de:1.13.2.2 Sun Aug 18 13:25:21 2019
+++ src/usr.sbin/sysinst/msg.mi.de Sun Nov 17 07:04:34 2019
@@ -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}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.19.2.3 src/usr.sbin/sysinst/msg.mi.en:1.19.2.4
--- src/usr.sbin/sysinst/msg.mi.en:1.19.2.3 Wed Oct 23 06:01:55 2019
+++ src/usr.sbin/sysinst/msg.mi.en Sun Nov 17 07:04:34 2019
@@ -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}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.14.2.2 src/usr.sbin/sysinst/msg.mi.es:1.14.2.3
--- src/usr.sbin/sysinst/msg.mi.es:1.14.2.2 Sun Aug 18 13:25:21 2019
+++ src/usr.sbin/sysinst/msg.mi.es Sun Nov 17 07:04:34 2019
@@ -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}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.17.2.3 src/usr.sbin/sysinst/msg.mi.fr:1.17.2.4
--- src/usr.sbin/sysinst/msg.mi.fr:1.17.2.3 Wed Oct 23 06:01:55 2019
+++ src/usr.sbin/sysinst/msg.mi.fr Sun Nov 17 07:04:34 2019
@@ -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}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.20.2.3 src/usr.sbin/sysinst/msg.mi.pl:1.20.2.4
--- src/usr.sbin/sysinst/msg.mi.pl:1.20.2.3 Thu Oct 24 16:27:21 2019
+++ src/usr.sbin/sysinst/msg.mi.pl Sun Nov 17 07:04:34 2019
@@ -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}
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.29.2.3 src/usr.sbin/sysinst/util.c:1.29.2.4
--- src/usr.sbin/sysinst/util.c:1.29.2.3 Wed Aug 28 10:00:53 2019
+++ src/usr.sbin/sysinst/util.c Sun Nov 17 07:04:34 2019
@@ -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},
Index: src/usr.sbin/sysinst/arch/acorn32/md.h
diff -u src/usr.sbin/sysinst/arch/acorn32/md.h:1.2 src/usr.sbin/sysinst/arch/acorn32/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/acorn32/md.h:1.2 Sun Nov 18 10:34:45 2018
+++ src/usr.sbin/sysinst/arch/acorn32/md.h Sun Nov 17 07:04:35 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/amd64/md.h
diff -u src/usr.sbin/sysinst/arch/amd64/md.h:1.6 src/usr.sbin/sysinst/arch/amd64/md.h:1.6.2.1
--- src/usr.sbin/sysinst/arch/amd64/md.h:1.6 Sun Jul 14 11:27:33 2019
+++ src/usr.sbin/sysinst/arch/amd64/md.h Sun Nov 17 07:04:37 2019
@@ -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.
Index: src/usr.sbin/sysinst/arch/amiga/md.h
diff -u src/usr.sbin/sysinst/arch/amiga/md.h:1.3 src/usr.sbin/sysinst/arch/amiga/md.h:1.3.2.1
--- src/usr.sbin/sysinst/arch/amiga/md.h:1.3 Sun Nov 18 10:34:45 2018
+++ src/usr.sbin/sysinst/arch/amiga/md.h Sun Nov 17 07:04:36 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/arc/md.h
diff -u src/usr.sbin/sysinst/arch/arc/md.h:1.3 src/usr.sbin/sysinst/arch/arc/md.h:1.3.2.1
--- src/usr.sbin/sysinst/arch/arc/md.h:1.3 Wed Jun 12 06:20:18 2019
+++ src/usr.sbin/sysinst/arch/arc/md.h Sun Nov 17 07:04:35 2019
@@ -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
Index: src/usr.sbin/sysinst/arch/atari/md.h
diff -u src/usr.sbin/sysinst/arch/atari/md.h:1.2 src/usr.sbin/sysinst/arch/atari/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/atari/md.h:1.2 Fri Nov 16 19:54:03 2018
+++ src/usr.sbin/sysinst/arch/atari/md.h Sun Nov 17 07:04:34 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/bebox/md.h
diff -u src/usr.sbin/sysinst/arch/bebox/md.h:1.2 src/usr.sbin/sysinst/arch/bebox/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/bebox/md.h:1.2 Sun Nov 18 10:34:45 2018
+++ src/usr.sbin/sysinst/arch/bebox/md.h Sun Nov 17 07:04:35 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/cats/md.h
diff -u src/usr.sbin/sysinst/arch/cats/md.h:1.3 src/usr.sbin/sysinst/arch/cats/md.h:1.3.2.1
--- src/usr.sbin/sysinst/arch/cats/md.h:1.3 Sun Nov 18 10:37:04 2018
+++ src/usr.sbin/sysinst/arch/cats/md.h Sun Nov 17 07:04:37 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/cobalt/md.h
diff -u src/usr.sbin/sysinst/arch/cobalt/md.h:1.3 src/usr.sbin/sysinst/arch/cobalt/md.h:1.3.2.1
--- src/usr.sbin/sysinst/arch/cobalt/md.h:1.3 Wed Jun 12 06:20:19 2019
+++ src/usr.sbin/sysinst/arch/cobalt/md.h Sun Nov 17 07:04:38 2019
@@ -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
Index: src/usr.sbin/sysinst/arch/emips/md.h
diff -u src/usr.sbin/sysinst/arch/emips/md.h:1.4 src/usr.sbin/sysinst/arch/emips/md.h:1.4.2.1
--- src/usr.sbin/sysinst/arch/emips/md.h:1.4 Fri Nov 16 19:54:03 2018
+++ src/usr.sbin/sysinst/arch/emips/md.h Sun Nov 17 07:04:36 2019
@@ -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
Index: src/usr.sbin/sysinst/arch/evbarm/md.h
diff -u src/usr.sbin/sysinst/arch/evbarm/md.h:1.2 src/usr.sbin/sysinst/arch/evbarm/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/evbarm/md.h:1.2 Wed Jun 12 06:20:19 2019
+++ src/usr.sbin/sysinst/arch/evbarm/md.h Sun Nov 17 07:04:37 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/evbmips/md.h
diff -u src/usr.sbin/sysinst/arch/evbmips/md.h:1.2 src/usr.sbin/sysinst/arch/evbmips/md.h:1.2.6.1
--- src/usr.sbin/sysinst/arch/evbmips/md.h:1.2 Wed Aug 9 23:01:06 2017
+++ src/usr.sbin/sysinst/arch/evbmips/md.h Sun Nov 17 07:04:37 2019
@@ -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)
Index: src/usr.sbin/sysinst/arch/evbppc/md.h
diff -u src/usr.sbin/sysinst/arch/evbppc/md.h:1.2 src/usr.sbin/sysinst/arch/evbppc/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/evbppc/md.h:1.2 Sun Nov 18 10:34:46 2018
+++ src/usr.sbin/sysinst/arch/evbppc/md.h Sun Nov 17 07:04:33 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/hp300/md.h
diff -u src/usr.sbin/sysinst/arch/hp300/md.h:1.4 src/usr.sbin/sysinst/arch/hp300/md.h:1.4.2.1
--- src/usr.sbin/sysinst/arch/hp300/md.h:1.4 Wed Jun 12 06:20:20 2019
+++ src/usr.sbin/sysinst/arch/hp300/md.h Sun Nov 17 07:04:37 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/hpcarm/md.h
diff -u src/usr.sbin/sysinst/arch/hpcarm/md.h:1.2 src/usr.sbin/sysinst/arch/hpcarm/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/hpcarm/md.h:1.2 Sun Nov 18 10:34:46 2018
+++ src/usr.sbin/sysinst/arch/hpcarm/md.h Sun Nov 17 07:04:33 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/hpcmips/md.h
diff -u src/usr.sbin/sysinst/arch/hpcmips/md.h:1.2 src/usr.sbin/sysinst/arch/hpcmips/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/hpcmips/md.h:1.2 Sun Nov 18 10:34:46 2018
+++ src/usr.sbin/sysinst/arch/hpcmips/md.h Sun Nov 17 07:04:35 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/hpcsh/md.h
diff -u src/usr.sbin/sysinst/arch/hpcsh/md.h:1.1 src/usr.sbin/sysinst/arch/hpcsh/md.h:1.1.30.1
--- src/usr.sbin/sysinst/arch/hpcsh/md.h:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/hpcsh/md.h Sun Nov 17 07:04:35 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/i386/md.h
diff -u src/usr.sbin/sysinst/arch/i386/md.h:1.6 src/usr.sbin/sysinst/arch/i386/md.h:1.6.2.1
--- src/usr.sbin/sysinst/arch/i386/md.h:1.6 Sun Jul 14 11:27:33 2019
+++ src/usr.sbin/sysinst/arch/i386/md.h Sun Nov 17 07:04:34 2019
@@ -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
Index: src/usr.sbin/sysinst/arch/landisk/md.h
diff -u src/usr.sbin/sysinst/arch/landisk/md.h:1.1 src/usr.sbin/sysinst/arch/landisk/md.h:1.1.30.1
--- src/usr.sbin/sysinst/arch/landisk/md.h:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/landisk/md.h Sun Nov 17 07:04:38 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/mvme68k/md.h
diff -u src/usr.sbin/sysinst/arch/mvme68k/md.h:1.2 src/usr.sbin/sysinst/arch/mvme68k/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/mvme68k/md.h:1.2 Fri Nov 16 19:54:04 2018
+++ src/usr.sbin/sysinst/arch/mvme68k/md.h Sun Nov 17 07:04:33 2019
@@ -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
Index: src/usr.sbin/sysinst/arch/ofppc/md.h
diff -u src/usr.sbin/sysinst/arch/ofppc/md.h:1.3 src/usr.sbin/sysinst/arch/ofppc/md.h:1.3.2.1
--- src/usr.sbin/sysinst/arch/ofppc/md.h:1.3 Wed Jun 12 06:20:22 2019
+++ src/usr.sbin/sysinst/arch/ofppc/md.h Sun Nov 17 07:04:38 2019
@@ -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.
Index: src/usr.sbin/sysinst/arch/playstation2/md.h
diff -u src/usr.sbin/sysinst/arch/playstation2/md.h:1.1 src/usr.sbin/sysinst/arch/playstation2/md.h:1.1.30.1
--- src/usr.sbin/sysinst/arch/playstation2/md.h:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/playstation2/md.h Sun Nov 17 07:04:33 2019
@@ -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
Index: src/usr.sbin/sysinst/arch/pmax/md.h
diff -u src/usr.sbin/sysinst/arch/pmax/md.h:1.3 src/usr.sbin/sysinst/arch/pmax/md.h:1.3.2.1
--- src/usr.sbin/sysinst/arch/pmax/md.h:1.3 Fri Nov 16 19:54:04 2018
+++ src/usr.sbin/sysinst/arch/pmax/md.h Sun Nov 17 07:04:36 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/prep/md.h
diff -u src/usr.sbin/sysinst/arch/prep/md.h:1.3 src/usr.sbin/sysinst/arch/prep/md.h:1.3.2.1
--- src/usr.sbin/sysinst/arch/prep/md.h:1.3 Wed Jun 12 06:20:22 2019
+++ src/usr.sbin/sysinst/arch/prep/md.h Sun Nov 17 07:04:37 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/sandpoint/md.h
diff -u src/usr.sbin/sysinst/arch/sandpoint/md.h:1.2 src/usr.sbin/sysinst/arch/sandpoint/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/sandpoint/md.h:1.2 Sun Nov 18 10:34:46 2018
+++ src/usr.sbin/sysinst/arch/sandpoint/md.h Sun Nov 17 07:04:33 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/sgimips/md.h
diff -u src/usr.sbin/sysinst/arch/sgimips/md.h:1.3 src/usr.sbin/sysinst/arch/sgimips/md.h:1.3.2.1
--- src/usr.sbin/sysinst/arch/sgimips/md.h:1.3 Wed Jun 12 06:20:22 2019
+++ src/usr.sbin/sysinst/arch/sgimips/md.h Sun Nov 17 07:04:37 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/shark/md.h
diff -u src/usr.sbin/sysinst/arch/shark/md.h:1.2 src/usr.sbin/sysinst/arch/shark/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/shark/md.h:1.2 Sun Nov 18 10:34:46 2018
+++ src/usr.sbin/sysinst/arch/shark/md.h Sun Nov 17 07:04:36 2019
@@ -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"
Index: src/usr.sbin/sysinst/arch/x68k/md.h
diff -u src/usr.sbin/sysinst/arch/x68k/md.h:1.2 src/usr.sbin/sysinst/arch/x68k/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/x68k/md.h:1.2 Fri Nov 16 19:54:05 2018
+++ src/usr.sbin/sysinst/arch/x68k/md.h Sun Nov 17 07:04:35 2019
@@ -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.
Index: src/usr.sbin/sysinst/arch/zaurus/md.h
diff -u src/usr.sbin/sysinst/arch/zaurus/md.h:1.2 src/usr.sbin/sysinst/arch/zaurus/md.h:1.2.2.1
--- src/usr.sbin/sysinst/arch/zaurus/md.h:1.2 Sun Nov 18 10:34:46 2018
+++ src/usr.sbin/sysinst/arch/zaurus/md.h Sun Nov 17 07:04:34 2019
@@ -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
