Module Name: src
Committed By: tsutsui
Date: Sat Dec 5 18:52:06 UTC 2020
Modified Files:
src/distrib/amiga/miniroot: install.md
src/distrib/hp300/miniroot: install.md
src/distrib/mac68k/miniroot: install.md
src/distrib/miniroot: install.sub list
src/distrib/mvme68k/miniroot: install.md
src/distrib/sun2/miniroot: install.md
src/distrib/sun3/miniroot: install.md
Log Message:
Use proper release version strings ("9.1" rather than "91") in banners.
Also define and use "MACHINE" variable to describe port names
(no uname(1) or sysctl(8) in miniroot binary list by default).
I guess the short format like "91" by ${DISTRIBREV} was used only
for split sets for floppies in 1990's releases.
Worth to pullup to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/distrib/amiga/miniroot/install.md
cvs rdiff -u -r1.19 -r1.20 src/distrib/hp300/miniroot/install.md
cvs rdiff -u -r1.7 -r1.8 src/distrib/mac68k/miniroot/install.md
cvs rdiff -u -r1.56 -r1.57 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.35 -r1.36 src/distrib/miniroot/list
cvs rdiff -u -r1.9 -r1.10 src/distrib/mvme68k/miniroot/install.md
cvs rdiff -u -r1.6 -r1.7 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.6 -r1.7 src/distrib/sun3/miniroot/install.md
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amiga/miniroot/install.md
diff -u src/distrib/amiga/miniroot/install.md:1.30 src/distrib/amiga/miniroot/install.md:1.31
--- src/distrib/amiga/miniroot/install.md:1.30 Wed Apr 10 14:52:53 2019
+++ src/distrib/amiga/miniroot/install.md Sat Dec 5 18:52:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.30 2019/04/10 14:52:53 christos Exp $
+# $NetBSD: install.md,v 1.31 2020/12/05 18:52:06 tsutsui Exp $
#
#
# Copyright (c) 1996,2006 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@ md_labeldisk() {
md_welcome_banner() {
if [ "$MODE" = "install" ]; then
echo ""
- echo "Welcome to the NetBSD/amiga ${VERSION} installation program."
+ echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
cat << \__welcome_banner_1
This program is designed to help you put NetBSD on your disk,
@@ -151,7 +151,7 @@ __welcome_banner_1
else
echo ""
- echo "Welcome to the NetBSD/amiga ${VERSION} upgrade program."
+ echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} upgrade program."
cat << \__welcome_banner_2
This program is designed to help you upgrade your NetBSD system in a
Index: src/distrib/hp300/miniroot/install.md
diff -u src/distrib/hp300/miniroot/install.md:1.19 src/distrib/hp300/miniroot/install.md:1.20
--- src/distrib/hp300/miniroot/install.md:1.19 Sat Dec 5 18:27:39 2020
+++ src/distrib/hp300/miniroot/install.md Sat Dec 5 18:52:06 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: install.md,v 1.19 2020/12/05 18:27:39 tsutsui Exp $
+# $NetBSD: install.md,v 1.20 2020/12/05 18:52:06 tsutsui Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -475,7 +475,7 @@ __md_copy_kernel_1
md_welcome_banner() {
(
echo ""
- echo "Welcome to the NetBSD/hp300 ${VERSION} installation program."
+ echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
cat << \__welcome_banner_1
This program is designed to help you install NetBSD on your system in a
Index: src/distrib/mac68k/miniroot/install.md
diff -u src/distrib/mac68k/miniroot/install.md:1.7 src/distrib/mac68k/miniroot/install.md:1.8
--- src/distrib/mac68k/miniroot/install.md:1.7 Sat Dec 5 18:27:39 2020
+++ src/distrib/mac68k/miniroot/install.md Sat Dec 5 18:52:06 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: install.md,v 1.7 2020/12/05 18:27:39 tsutsui Exp $
+# $NetBSD: install.md,v 1.8 2020/12/05 18:52:06 tsutsui Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -127,7 +127,7 @@ md_copy_kernel() {
md_welcome_banner() {
(
echo ""
- echo "Welcome to the NetBSD/mac68k ${VERSION} installation program."
+ echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
cat << \__welcome_banner_1
This program is designed to help you install NetBSD on your system in a
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.56 src/distrib/miniroot/install.sub:1.57
--- src/distrib/miniroot/install.sub:1.56 Sat Dec 5 18:33:47 2020
+++ src/distrib/miniroot/install.sub Sat Dec 5 18:52:06 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.56 2020/12/05 18:33:47 tsutsui Exp $
+# $NetBSD: install.sub,v 1.57 2020/12/05 18:52:06 tsutsui Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,8 +32,12 @@
# NetBSD installation/upgrade script - common subroutines.
ROOTDISK="" # filled in below
-VERSION=89936
+MACHINE= # filled by distrib/miniroot/list
+export MACHINE
+VERSION=100 # updated by distrib/miniroot/list
export VERSION
+RELEASE=10.0 # updated by distrib/miniroot/list
+export RELEASE
ALLSETS="base comp etc games man misc modules rescue text" # default install sets
UPGRSETS="base comp games man misc text" # default upgrade sets
Index: src/distrib/miniroot/list
diff -u src/distrib/miniroot/list:1.35 src/distrib/miniroot/list:1.36
--- src/distrib/miniroot/list:1.35 Sun Jun 19 06:48:07 2011
+++ src/distrib/miniroot/list Sat Dec 5 18:52:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.35 2011/06/19 06:48:07 tsutsui Exp $
+# $NetBSD: list,v 1.36 2020/12/05 18:52:06 tsutsui Exp $
SRCDIRS bin sbin usr.bin usr.sbin
@@ -71,5 +71,5 @@ COPY ${DISTRIBDIR}/common/services etc/
# and the installation scripts
COPY ${CURDIR}/install.sh install 555
COPY ${CURDIR}/upgrade.sh upgrade 555
-CMD sed "/^VERSION=/s/=.*/=${DISTRIBREV}/" < ${CURDIR}/install.sub > install.sub
+CMD sed -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" -e "/^RELEASE=/s/=.*/=${DISTRIBVER}/" -e "/^MACHINE=/s/=.*/=${MACHINE}/" < ${CURDIR}/install.sub > install.sub
MTREE ./install.sub type=file uname=root gname=wheel mode=0444
Index: src/distrib/mvme68k/miniroot/install.md
diff -u src/distrib/mvme68k/miniroot/install.md:1.9 src/distrib/mvme68k/miniroot/install.md:1.10
--- src/distrib/mvme68k/miniroot/install.md:1.9 Sat Dec 5 18:16:11 2020
+++ src/distrib/mvme68k/miniroot/install.md Sat Dec 5 18:52:06 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: install.md,v 1.9 2020/12/05 18:16:11 tsutsui Exp $
+# $NetBSD: install.md,v 1.10 2020/12/05 18:52:06 tsutsui Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -176,7 +176,7 @@ md_copy_kernel() {
}
md_welcome_banner() {
- echo "Welcome to the NetBSD/mvme68k ${VERSION} installation program."
+ echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
cat << \__welcome_banner_1
This program is designed to help you install NetBSD on your system in a simple
Index: src/distrib/sun2/miniroot/install.md
diff -u src/distrib/sun2/miniroot/install.md:1.6 src/distrib/sun2/miniroot/install.md:1.7
--- src/distrib/sun2/miniroot/install.md:1.6 Sat Dec 5 18:16:11 2020
+++ src/distrib/sun2/miniroot/install.md Sat Dec 5 18:52:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.6 2020/12/05 18:16:11 tsutsui Exp $
+# $NetBSD: install.md,v 1.7 2020/12/05 18:52:06 tsutsui Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@ md_copy_kernel() {
md_welcome_banner() {
if [ "$MODE" = "install" ]; then
echo ""
- echo "Welcome to the NetBSD/sun2 ${VERSION} installation program."
+ echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
cat << \__welcome_banner_1
This program is designed to help you put NetBSD on your disk,
@@ -157,7 +157,7 @@ __welcome_banner_1
else
echo ""
- echo "Welcome to the NetBSD/sun2 ${VERSION} upgrade program."
+ echo "Welcome to the NetBSD/${MACHINE} ${VERSION} upgrade program."
cat << \__welcome_banner_2
This program is designed to help you upgrade your NetBSD system in a
Index: src/distrib/sun3/miniroot/install.md
diff -u src/distrib/sun3/miniroot/install.md:1.6 src/distrib/sun3/miniroot/install.md:1.7
--- src/distrib/sun3/miniroot/install.md:1.6 Sat Dec 5 18:16:11 2020
+++ src/distrib/sun3/miniroot/install.md Sat Dec 5 18:52:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.6 2020/12/05 18:16:11 tsutsui Exp $
+# $NetBSD: install.md,v 1.7 2020/12/05 18:52:06 tsutsui Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@ md_copy_kernel() {
md_welcome_banner() {
if [ "$MODE" = "install" ]; then
echo ""
- echo "Welcome to the NetBSD/sun3 ${VERSION} installation program."
+ echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
cat << \__welcome_banner_1
This program is designed to help you put NetBSD on your disk,
@@ -157,7 +157,7 @@ __welcome_banner_1
else
echo ""
- echo "Welcome to the NetBSD/sun3 ${VERSION} upgrade program."
+ echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} upgrade program."
cat << \__welcome_banner_2
This program is designed to help you upgrade your NetBSD system in a
