Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Split out /rescue to its own set and adapt installers/images...
details: https://anonhg.NetBSD.org/src/rev/83c665145099
branches: trunk
changeset: 464319:83c665145099
user: maya <maya%NetBSD.org@localhost>
date: Wed Oct 02 11:15:59 2019 +0000
description:
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:
distrib/amd64/uefi-installimage/Makefile.bootimage | 8 +-
distrib/common/bootimage/Makefile.bootimage | 8 +-
distrib/miniroot/install.sub | 8 +-
distrib/notes/atari/xfer | 4 +-
distrib/notes/mvme68k/xfer | 4 +-
distrib/sets/README | 4 +-
distrib/sets/lists/base/rescue.mi | 168 --------------------
distrib/sets/lists/rescue/mi | 170 +++++++++++++++++++++
distrib/sets/maketars | 4 +-
distrib/sets/regpkgset | 4 +-
distrib/sets/sets.subr | 6 +-
distrib/sun2/MakeInstTape | 4 +-
distrib/sun3/MakeInstTape | 4 +-
distrib/utils/embedded/mkimage | 4 +-
etc/Makefile | 4 +-
usr.sbin/sysinst/arch/acorn32/md.h | 4 +-
usr.sbin/sysinst/arch/amd64/md.h | 4 +-
usr.sbin/sysinst/arch/amiga/md.h | 4 +-
usr.sbin/sysinst/arch/arc/md.h | 4 +-
usr.sbin/sysinst/arch/atari/md.h | 4 +-
usr.sbin/sysinst/arch/bebox/md.h | 4 +-
usr.sbin/sysinst/arch/cats/md.h | 4 +-
usr.sbin/sysinst/arch/cobalt/md.h | 4 +-
usr.sbin/sysinst/arch/emips/md.h | 4 +-
usr.sbin/sysinst/arch/evbarm/md.h | 4 +-
usr.sbin/sysinst/arch/evbmips/md.h | 4 +-
usr.sbin/sysinst/arch/evbppc/md.h | 4 +-
usr.sbin/sysinst/arch/hp300/md.h | 4 +-
usr.sbin/sysinst/arch/hpcarm/md.h | 4 +-
usr.sbin/sysinst/arch/hpcmips/md.h | 4 +-
usr.sbin/sysinst/arch/hpcsh/md.h | 4 +-
usr.sbin/sysinst/arch/i386/md.h | 4 +-
usr.sbin/sysinst/arch/landisk/md.h | 4 +-
usr.sbin/sysinst/arch/mvme68k/md.h | 4 +-
usr.sbin/sysinst/arch/ofppc/md.h | 4 +-
usr.sbin/sysinst/arch/playstation2/md.h | 4 +-
usr.sbin/sysinst/arch/pmax/md.h | 4 +-
usr.sbin/sysinst/arch/prep/md.h | 4 +-
usr.sbin/sysinst/arch/sandpoint/md.h | 4 +-
usr.sbin/sysinst/arch/sgimips/md.h | 4 +-
usr.sbin/sysinst/arch/shark/md.h | 4 +-
usr.sbin/sysinst/arch/x68k/md.h | 4 +-
usr.sbin/sysinst/arch/zaurus/md.h | 4 +-
usr.sbin/sysinst/defs.h | 6 +-
usr.sbin/sysinst/msg.mi.de | 5 +-
usr.sbin/sysinst/msg.mi.en | 5 +-
usr.sbin/sysinst/msg.mi.es | 5 +-
usr.sbin/sysinst/msg.mi.fr | 5 +-
usr.sbin/sysinst/msg.mi.pl | 5 +-
usr.sbin/sysinst/util.c | 3 +-
50 files changed, 286 insertions(+), 264 deletions(-)
diffs (truncated from 1263 to 300 lines):
diff -r 75498cd60e68 -r 83c665145099 distrib/amd64/uefi-installimage/Makefile.bootimage
--- a/distrib/amd64/uefi-installimage/Makefile.bootimage Wed Oct 02 11:14:46 2019 +0000
+++ b/distrib/amd64/uefi-installimage/Makefile.bootimage Wed Oct 02 11:15:59 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.11 2019/02/22 22:20:18 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.12 2019/10/02 11:15:59 maya 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 @@
#
# 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
diff -r 75498cd60e68 -r 83c665145099 distrib/common/bootimage/Makefile.bootimage
--- a/distrib/common/bootimage/Makefile.bootimage Wed Oct 02 11:14:46 2019 +0000
+++ b/distrib/common/bootimage/Makefile.bootimage Wed Oct 02 11:15:59 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.21 2019/02/22 22:13:58 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.22 2019/10/02 11:15:59 maya 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 @@
#
# 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
diff -r 75498cd60e68 -r 83c665145099 distrib/miniroot/install.sub
--- a/distrib/miniroot/install.sub Wed Oct 02 11:14:46 2019 +0000
+++ b/distrib/miniroot/install.sub Wed Oct 02 11:15:59 2019 +0000
@@ -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.49 2019/10/02 11:15:59 maya Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,9 +35,9 @@
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
diff -r 75498cd60e68 -r 83c665145099 distrib/notes/atari/xfer
--- a/distrib/notes/atari/xfer Wed Oct 02 11:14:46 2019 +0000
+++ b/distrib/notes/atari/xfer Wed Oct 02 11:15:59 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: xfer,v 1.16 2008/09/06 21:39:24 tsutsui Exp $
+.\" $NetBSD: xfer,v 1.17 2019/10/02 11:16:00 maya Exp $
.
Installation is supported from several media types, including:
.Pp
@@ -92,7 +92,7 @@
.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"
diff -r 75498cd60e68 -r 83c665145099 distrib/notes/mvme68k/xfer
--- a/distrib/notes/mvme68k/xfer Wed Oct 02 11:14:46 2019 +0000
+++ b/distrib/notes/mvme68k/xfer Wed Oct 02 11:15:59 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: xfer,v 1.18 2014/10/17 21:48:38 snj Exp $
+.\" $NetBSD: xfer,v 1.19 2019/10/02 11:16:00 maya Exp $
.
Installation is supported from several media types, including:
.(bullet
@@ -52,7 +52,7 @@
.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"
diff -r 75498cd60e68 -r 83c665145099 distrib/sets/README
--- a/distrib/sets/README Wed Oct 02 11:14:46 2019 +0000
+++ b/distrib/sets/README Wed Oct 02 11:15:59 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: README,v 1.13 2013/08/06 22:33:59 soren Exp $
+# $NetBSD: README,v 1.14 2019/10/02 11:16:00 maya Exp $
the scripts should be run from the directory where they reside.
@@ -62,6 +62,8 @@
modules: stand/${MACHINE}/${OSRELEASE}/modules kernel modules
+ rescue: Standalone system recovery tools.
+
tests: unit, regression, integration and stress tests for the
whole system.
diff -r 75498cd60e68 -r 83c665145099 distrib/sets/lists/base/rescue.mi
--- a/distrib/sets/lists/base/rescue.mi Wed Oct 02 11:14:46 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-# $NetBSD: rescue.mi,v 1.46 2019/10/02 09:47:24 maya Exp $
-#
-# Note: don't delete entries from here - mark them as "obsolete" instead.
-#
-./rescue/[ base-rescue-root
-./rescue/atactl base-rescue-root
-./rescue/badsect base-rescue-root
-./rescue/brconfig base-rescue-root
-./rescue/bunzip2 base-rescue-root
-./rescue/bzcat base-rescue-root
-./rescue/bzip2 base-rescue-root
-./rescue/cat base-rescue-root
-./rescue/ccdconfig base-rescue-root
-./rescue/cgdconfig base-rescue-root
-./rescue/chgrp base-rescue-root
-./rescue/chio base-rescue-root
-./rescue/chmod base-rescue-root
-./rescue/chown base-rescue-root
-./rescue/chroot base-rescue-root
-./rescue/clri base-rescue-root
-./rescue/cp base-rescue-root
-./rescue/csh base-rescue-root
-./rescue/date base-rescue-root
-./rescue/dd base-rescue-root
-./rescue/df base-rescue-root
-./rescue/disklabel base-rescue-root
-./rescue/dkctl base-rescue-root
-./rescue/dmesg base-rescue-root
-./rescue/domainname base-rescue-root
-./rescue/dump base-rescue-root
-./rescue/dump_lfs base-rescue-root
-./rescue/dumpfs base-rescue-root
-./rescue/dumplfs base-rescue-root
-./rescue/echo base-rescue-root
-./rescue/ed base-rescue-root
-./rescue/edlabel base-obsolete obsolete
-./rescue/egrep base-rescue-root
-./rescue/ekermit base-rescue-root
-./rescue/ex base-rescue-root
-./rescue/expr base-rescue-root
-./rescue/fdisk base-rescue-root
-./rescue/fgrep base-rescue-root
-./rescue/fsck base-rescue-root
-./rescue/fsck_ext2fs base-rescue-root
-./rescue/fsck_ffs base-rescue-root
-./rescue/fsck_lfs base-rescue-root
-./rescue/fsck_msdos base-rescue-root
-./rescue/fsdb base-rescue-root
-./rescue/fsirand base-rescue-root
-./rescue/ftp base-rescue-root
-./rescue/gpt base-rescue-root
-./rescue/grep base-rescue-root
-./rescue/gunzip base-rescue-root
-./rescue/gzcat base-rescue-root
-./rescue/gzip base-rescue-root
-./rescue/halt base-rescue-root
-./rescue/hostname base-rescue-root
-./rescue/ifconfig base-rescue-root
-./rescue/init base-rescue-root
-./rescue/init.bak base-rescue-root
-./rescue/installboot base-rescue-root
-./rescue/ipppctl base-obsolete obsolete
-./rescue/kdump base-rescue-root
-./rescue/kill base-rescue-root
-./rescue/ksh base-rescue-root
-./rescue/ktrace base-rescue-root
-./rescue/ktruss base-rescue-root
-./rescue/ldconfig base-obsolete obsolete
-./rescue/ldd base-rescue-root
-./rescue/less base-rescue-root
-./rescue/lfs_cleanerd base-rescue-root
-./rescue/lmcconfig base-obsolete obsolete
-./rescue/lmcctl base-obsolete obsolete
-./rescue/ln base-rescue-root
-./rescue/ls base-rescue-root
-./rescue/mbrlabel base-rescue-root
-./rescue/mkdir base-rescue-root
-./rescue/mknod base-rescue-root
-./rescue/modload base-rescue-root
-./rescue/modstat base-rescue-root
-./rescue/modunload base-rescue-root
-./rescue/more base-rescue-root
-./rescue/mount base-rescue-root
-./rescue/mount_ados base-rescue-root
-./rescue/mount_cd9660 base-rescue-root
-./rescue/mount_efs base-rescue-root
-./rescue/mount_ext2fs base-rescue-root
-./rescue/mount_fdesc base-rescue-root
-./rescue/mount_ffs base-rescue-root
-./rescue/mount_filecore base-rescue-root
-./rescue/mount_kernfs base-rescue-root
-./rescue/mount_lfs base-rescue-root
-./rescue/mount_mfs base-rescue-root
-./rescue/mount_msdos base-rescue-root
-./rescue/mount_nfs base-rescue-root
-./rescue/mount_ntfs base-rescue-root
-./rescue/mount_null base-rescue-root
-./rescue/mount_overlay base-rescue-root
-./rescue/mount_portal base-obsolete obsolete
-./rescue/mount_procfs base-rescue-root
-./rescue/mount_smbfs base-rescue-root
-./rescue/mount_tmpfs base-rescue-root
-./rescue/mount_ufs base-rescue-root
-./rescue/mount_umap base-rescue-root
-./rescue/mount_union base-rescue-root
-./rescue/mt base-rescue-root
-./rescue/mv base-rescue-root
-./rescue/newfs base-rescue-root
-./rescue/newfs_lfs base-rescue-root
-./rescue/newfs_msdos base-rescue-root
-./rescue/pax base-rescue-root
-./rescue/pdisk base-rescue-root
-./rescue/ping base-rescue-root
-./rescue/ping6 base-rescue-root use_inet6
-./rescue/pppoectl base-rescue-root
-./rescue/progress base-rescue-root
-./rescue/ps base-rescue-root
-./rescue/pwd base-rescue-root
-./rescue/raidctl base-rescue-root
-./rescue/rcmd base-rescue-root
-./rescue/rcorder base-rescue-root
-./rescue/rcp base-rescue-root
-./rescue/rdump base-rescue-root
-./rescue/rdump_lfs base-rescue-root
-./rescue/reboot base-rescue-root
-./rescue/restore base-rescue-root
-./rescue/rm base-rescue-root
-./rescue/rmdir base-rescue-root
-./rescue/rndctl base-rescue-root
-./rescue/route base-rescue-root
-./rescue/routed base-rescue-root
-./rescue/rrestore base-rescue-root
-./rescue/rtsol base-obsolete obsolete
-./rescue/savecore base-rescue-root
-./rescue/scan_ffs base-rescue-root
-./rescue/scp base-rescue-root
-./rescue/scsictl base-rescue-root
-./rescue/setkey base-rescue-root
-./rescue/sh base-rescue-root
-./rescue/shutdown base-rescue-root
-./rescue/slattach base-rescue-root
-./rescue/sleep base-rescue-root
-./rescue/slogin base-rescue-root
-./rescue/ssh base-rescue-root
-./rescue/stty base-rescue-root
-./rescue/swapctl base-rescue-root
-./rescue/swapon base-rescue-root
-./rescue/sync base-rescue-root
-./rescue/sysctl base-rescue-root
-./rescue/systrace base-obsolete obsolete
-./rescue/tar base-rescue-root
-./rescue/terminfo.db base-obsolete obsolete
-./rescue/test base-rescue-root
-./rescue/tetris base-rescue-root
-./rescue/ttyflags base-rescue-root
-./rescue/tunefs base-rescue-root
-./rescue/umbctl base-rescue-root
-./rescue/umount base-rescue-root
-./rescue/veriexecctl base-rescue-root
-./rescue/vi base-rescue-root
-./rescue/vnconfig base-rescue-root
Home |
Main Index |
Thread Index |
Old Index