src - OpenBSD base system

diff options


context:
space:
mode:

author	Robert Peichaer <rpe@cvs.openbsd.org>	2017-07-28 18:15:45 +0000
committer	Robert Peichaer <rpe@cvs.openbsd.org>	2017-07-28 18:15:45 +0000
commit	79a575328402014361db766af9666ee71ebe65c4 (patch)
tree	0b6dc7f73f880940314371bc9178e36abcad3574 /distrib
parent	aff11244565e121716635ccb1d321fca7e65a220 (diff)

DEFAULTSETS, SANESETS and THESETS are set in the install.md scripts

according to the same logic for all architectures but sgi. Consolidate setting them in one place in install.sub and incorporate the sgi specific MDSETS and MDSANESETS. Introduce MDSANESETS complementing MDSETS which makes the construction of DEFAULTSETS, THESETS and SANESETS clearer in install.sub. While here, adjust the comment about how MDSETS used now. OK deraadt@

Diffstat (limited to 'distrib')

-rw-r--r--

distrib/alpha/common/install.md

-rw-r--r--

distrib/amd64/common/install.md

-rw-r--r--

distrib/arm64/ramdisk/install.md

-rw-r--r--

distrib/armv7/ramdisk/install.md

-rw-r--r--

distrib/hppa/install.md

-rw-r--r--

distrib/i386/common/install.md

-rw-r--r--

distrib/luna88k/ramdisk/install.md

-rw-r--r--

distrib/macppc/ramdisk/install.md

-rw-r--r--

distrib/miniroot/install.sub

-rw-r--r--

distrib/sgi/ramdisk/install.md

-rw-r--r--

distrib/sparc64/common/install.md

11 files changed, 23 insertions, 38 deletions

diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index 9b3c7fe19af..5a235819d3a 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.43 2016/09/04 09:52:03 rpe Exp $

+# $OpenBSD: install.md,v 1.44 2017/07/28 18:15:44 rpe Exp $

@@ -34,8 +34,6 @@

MDXAPERTURE=1

NCPU=$(sysctl -n hw.ncpufound)

-((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; }

md_installboot() {

# Use cat to avoid holes created by cp(1)

cat /mnt/usr/mdec/boot > /mnt/boot

diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index bba77426b52..d4fc8418a97 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.54 2017/01/22 23:43:54 rpe Exp $

+# $OpenBSD: install.md,v 1.55 2017/07/28 18:15:44 rpe Exp $

@@ -39,8 +39,6 @@ if dmesg | grep -q 'efifb0 at mainbus0'; then

MDEFI=y

-((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; }

md_installboot() {

if ! installboot -r /mnt ${1}; then

echo "\nFailed to install bootblocks."

diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md
index fdf911fd455..fc644719af6 100644
--- a/distrib/arm64/ramdisk/install.md
+++ b/distrib/arm64/ramdisk/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.5 2017/05/07 12:00:12 jsg Exp $

+# $OpenBSD: install.md,v 1.6 2017/07/28 18:15:44 rpe Exp $

@@ -32,9 +32,6 @@

# machine dependent section of installation/upgrade script.

-SANESETS="bsd"

-DEFAULTSETS="bsd bsd.rd"

NEWFSARGS_msdos="-F 16 -L boot"

MOUNT_ARGS_msdos="-o-l"

diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 158c52c19ea..658c957caeb 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.45 2017/01/24 05:29:22 jsg Exp $

+# $OpenBSD: install.md,v 1.46 2017/07/28 18:15:44 rpe Exp $

@@ -31,9 +31,6 @@

# machine dependent section of installation/upgrade script.

-SANESETS="bsd"

-DEFAULTSETS="bsd bsd.rd"

NEWFSARGS_msdos="-F 16 -L boot"

MOUNT_ARGS_msdos="-o-l"

diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md
index 2472606ec4a..c0e6fbcead5 100644
--- a/distrib/hppa/install.md
+++ b/distrib/hppa/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.32 2016/09/04 09:52:03 rpe Exp $

+# $OpenBSD: install.md,v 1.33 2017/07/28 18:15:44 rpe Exp $

# machine dependent section of installation/upgrade script.

@@ -6,8 +6,6 @@

MDTERM=vt100

NCPU=$(sysctl -n hw.ncpufound)

-((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; }

md_installboot() {

if ! installboot -r /mnt ${1}; then

echo "\nFailed to install bootblocks."

diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 860dc5926ee..c318e38a8b6 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.72 2017/01/22 23:43:54 rpe Exp $

+# $OpenBSD: install.md,v 1.73 2017/07/28 18:15:44 rpe Exp $

@@ -35,8 +35,6 @@ MDXAPERTURE=2

MDXDM=y

NCPU=$(sysctl -n hw.ncpufound)

-((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; }

md_installboot() {

if ! installboot -r /mnt ${1}; then

echo "\nFailed to install bootblocks."

diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md
index 772c4c7db7d..7c6143e8b7e 100644
--- a/distrib/luna88k/ramdisk/install.md
+++ b/distrib/luna88k/ramdisk/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.24 2017/01/22 23:43:54 rpe Exp $

+# $OpenBSD: install.md,v 1.25 2017/07/28 18:15:44 rpe Exp $

@@ -35,8 +35,6 @@ MDTERM=vt100

MDROOTFSOPT="-f 1024 -b 8192"

NCPU=$(sysctl -n hw.ncpufound)

-((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; }

md_installboot() {

cat /mnt/usr/mdec/boot > /mnt/boot

}

diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index a8bf69675da..57b6ee97058 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.70 2017/01/22 23:43:54 rpe Exp $

+# $OpenBSD: install.md,v 1.71 2017/07/28 18:15:44 rpe Exp $

@@ -35,8 +35,6 @@ MDXAPERTURE=2

MDXDM=y

NCPU=$(sysctl -n hw.ncpufound)

-((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; }

md_installboot() {

local _disk=$1

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index b0193dabd17..c40a852e505 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub

@@ -1,5 +1,5 @@

#!/bin/ksh

-# $OpenBSD: install.sub,v 1.1030 2017/07/25 21:17:11 rpe Exp $

+# $OpenBSD: install.sub,v 1.1031 2017/07/28 18:15:44 rpe Exp $

@@ -3092,7 +3092,8 @@ done

# The following variables can be provided if required:

# MDEFI - set to 'y' on archs that support GPT partitioning

# MDROOTFSOPT - newfs options for the root partition

-# MDSETS - list of files to add to THESETS

+# MDSETS - list of files to add to DEFAULT and THESETS

+# MDSANESETS - list of files to add to SANESETS

# MDTERM - 'vt220' assumed if not provided

# MDDKDEVS - '/^[sw]d[0-9][0-9]* /s/ .*//p' assumed if not provided

# MDCDDEVS - '/^cd[0-9][0-9]* /s/ .*//p' assumed if not provided

@@ -3154,9 +3155,14 @@ md_consoleinfo

# Ensure that siteXX.tgz is the *last* set listed so its contents overwrite

# the contents of the other sets, not the other way around.

SETS=$(echo {base,comp,man,game,xbase,xshare,xfont,xserv}$VERSION.tgz)

-DEFAULTSETS="${DEFAULTSETS:-bsd bsd.rd} $SETS"

-THESETS="bsd bsd.rd bsd.mp $MDSETS $SETS site$VERSION.tgz"

-SANESETS="${SANESETS:-bsd} base${VERSION}.tgz"

+DEFAULTSETS="${MDSETS:-bsd bsd.rd} $SETS"

+THESETS="${MDSETS:-bsd bsd.rd} $SETS site$VERSION.tgz"

+SANESETS="${MDSANESETS:-bsd} base${VERSION}.tgz"

+if ((NCPU > 1)); then

+ DEFAULTSETS="${MDSETS:-bsd bsd.mp bsd.rd} $SETS"

+ THESETS="${MDSETS:-bsd bsd.mp bsd.rd} $SETS site$VERSION.tgz"

+ SANESETS="${MDSANESETS:-bsd bsd.mp} base${VERSION}.tgz"

+fi

# Prepare COLUMNS sanely.

export COLUMNS=$(stty -a </dev/console |

diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md
index a9b46ad0cf1..c5ecd946340 100644
--- a/distrib/sgi/ramdisk/install.md
+++ b/distrib/sgi/ramdisk/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.43 2017/06/26 18:31:57 rpe Exp $

+# $OpenBSD: install.md,v 1.44 2017/07/28 18:15:44 rpe Exp $

@@ -36,12 +36,11 @@ NCPU=$(sysctl -n hw.ncpufound)

MDKERNEL=GENERIC-$IPARCH

MDSETS="bsd.$IPARCH bsd.rd.$IPARCH"

-SANESETS="bsd.$IPARCH"

+MDSANESETS=bsd.$IPARCH

if ((NCPU > 1)); then

MDSETS="$MDSETS bsd.mp.$IPARCH"

- SANESETS="$SANESETS bsd.mp.$IPARCH"

+ MDSANESETS="$MDSANESETS bsd.mp.$IPARCH"

-DEFAULTSETS=$MDSETS

md_installboot() {

local _disk=$1

diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index ce11f432f98..9bc62ea8bb7 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md

@@ -1,4 +1,4 @@

-# $OpenBSD: install.md,v 1.48 2017/01/22 23:43:54 rpe Exp $

+# $OpenBSD: install.md,v 1.49 2017/07/28 18:15:44 rpe Exp $

# $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $

@@ -37,8 +37,6 @@ MDXAPERTURE=1

MDXDM=y

NCPU=$(sysctl -n hw.ncpufound)

-((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp"; SANESETS="bsd bsd.mp"; }

md_installboot() {

if ! installboot -r /mnt ${1}; then

echo "\nFailed to install bootblocks."