diff options
Diffstat (limited to 'distrib')
-rw-r--r-- | distrib/alpha/common/install.md | 3 | ||||
-rw-r--r-- | distrib/amd64/common/install.md | 3 | ||||
-rw-r--r-- | distrib/armish/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/install.md | 3 | ||||
-rw-r--r-- | distrib/hppa/install.md | 3 | ||||
-rw-r--r-- | distrib/i386/common/install.md | 3 | ||||
-rw-r--r-- | distrib/landisk/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/luna88k/ramdisk/install.md | 3 | ||||
-rw-r--r-- | distrib/mac68k/ramdisk/install.md | 3 | ||||
-rw-r--r-- | distrib/macppc/ramdisk/install.md | 3 | ||||
-rw-r--r-- | distrib/miniroot/list2sh.awk | 4 | ||||
-rw-r--r-- | distrib/mvme68k/ramdisk/install.md | 3 | ||||
-rw-r--r-- | distrib/mvme88k/ramdisk/install.md | 3 | ||||
-rw-r--r-- | distrib/mvmeppc/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/sgi/ramdisk/install.md | 3 | ||||
-rw-r--r-- | distrib/socppc/ramdisk/install.md | 4 | ||||
-rw-r--r-- | distrib/sparc/install.md | 3 | ||||
-rw-r--r-- | distrib/sparc64/common/install.md | 3 | ||||
-rw-r--r-- | distrib/vax/install.md | 3 | ||||
-rw-r--r-- | distrib/zaurus/ramdisk/install.md | 3 |
20 files changed, 21 insertions, 44 deletions
diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md index ed7b58b2e55..73d5fa5c13e 100644 --- a/distrib/alpha/common/install.md +++ b/distrib/alpha/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.30 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.31 2009/06/04 00:44:46 krw Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -32,7 +32,6 @@ # MDXAPERTURE=1 -ARCH=ARCH md_installboot() { local _rawdev=/dev/r${1}c diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index bf4a367044a..7b00769c99f 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.21 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.22 2009/06/04 00:44:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -34,7 +34,6 @@ MDXAPERTURE=2 MDXDM=y -ARCH=ARCH NCPU=$(sysctl -n hw.ncpufound) ((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } diff --git a/distrib/armish/ramdisk/install.md b/distrib/armish/ramdisk/install.md index 278e9c3ce22..8b74cbc4ccd 100644 --- a/distrib/armish/ramdisk/install.md +++ b/distrib/armish/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.11 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.12 2009/06/04 00:44:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -32,8 +32,6 @@ # machine dependent section of installation/upgrade script. # -ARCH=ARCH - md_installboot() { } diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md index 78a8846f008..54a7661ebec 100644 --- a/distrib/hp300/ramdisk/install.md +++ b/distrib/hp300/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.53 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.54 2009/06/04 00:44:46 krw Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -32,7 +32,6 @@ # machine dependent section of installation/upgrade script # -ARCH=ARCH MDDKDEVS="/^[hs]d[0-9][0-9]* /s/ .*//p" md_installboot() { diff --git a/distrib/hppa/install.md b/distrib/hppa/install.md index df278e0e525..1f5348c9f9b 100644 --- a/distrib/hppa/install.md +++ b/distrib/hppa/install.md @@ -1,10 +1,9 @@ -# $OpenBSD: install.md,v 1.14 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.15 2009/06/04 00:44:46 krw Exp $ # # machine dependent section of installation/upgrade script. # MDTERM=vt100 -ARCH=ARCH md_installboot() { /sbin/disklabel -B $1 diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md index 23298737679..7aaf3a3f63a 100644 --- a/distrib/i386/common/install.md +++ b/distrib/i386/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.44 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.45 2009/06/04 00:44:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -34,7 +34,6 @@ MDXAPERTURE=2 MDXDM=y -ARCH=ARCH NCPU=$(sysctl -n hw.ncpufound) ((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md index a770452154e..58be58d90bb 100644 --- a/distrib/landisk/ramdisk/install.md +++ b/distrib/landisk/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.23 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.24 2009/06/04 00:44:47 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -32,8 +32,6 @@ # machine dependent section of installation/upgrade script. # -ARCH=ARCH - md_installboot() { disklabel -B ${1} diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md index 4877c4503ea..e3616ebabd9 100644 --- a/distrib/luna88k/ramdisk/install.md +++ b/distrib/luna88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.11 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.12 2009/06/04 00:44:47 krw Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -33,7 +33,6 @@ MDTERM=vt100 MDROOTFSOPT="-f 1024 -b 8192" -ARCH=ARCH md_installboot() { } diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md index 9d220cbfcd7..39d5042447f 100644 --- a/distrib/mac68k/ramdisk/install.md +++ b/distrib/mac68k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.35 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.36 2009/06/04 00:44:47 krw Exp $ # # Copyright (c) 2002, Miodrag Vallat. # All rights reserved. @@ -57,7 +57,6 @@ # Machine-dependent install sets MDSETS="bsdsbc bsdsbc.rd" -ARCH=ARCH md_installboot() { } diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md index 059f1081da7..6f019a481ab 100644 --- a/distrib/macppc/ramdisk/install.md +++ b/distrib/macppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.43 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.44 2009/06/04 00:44:47 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -33,7 +33,6 @@ # MDXAPERTURE=2 -ARCH=ARCH NCPU=$(sysctl -n hw.ncpufound) ((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } diff --git a/distrib/miniroot/list2sh.awk b/distrib/miniroot/list2sh.awk index eebdd44faf1..c42f84e2e8a 100644 --- a/distrib/miniroot/list2sh.awk +++ b/distrib/miniroot/list2sh.awk @@ -1,4 +1,4 @@ -# $OpenBSD: list2sh.awk,v 1.15 2009/05/30 03:58:03 miod Exp $ +# $OpenBSD: list2sh.awk,v 1.16 2009/06/04 00:44:47 krw Exp $ # $NetBSD: list2sh.awk,v 1.2 1996/05/04 15:45:31 pk Exp $ BEGIN { @@ -100,7 +100,7 @@ $1 == "TERMCAP" { } $1 == "SCRIPT" { printf("echo '%s'\n", $0); - printf("sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e \"s/^ARCH=ARCH$/ARCH=`arch -ks`/\" < %s > ${TARGDIR}/%s\n", + printf("sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < %s > ${TARGDIR}/%s\n", $2, $3); next; } diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md index fd8a9b0f2c1..f48961573b1 100644 --- a/distrib/mvme68k/ramdisk/install.md +++ b/distrib/mvme68k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.38 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.39 2009/06/04 00:44:47 krw Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -32,7 +32,6 @@ # MDTERM=vt100 -ARCH=ARCH md_installboot() { cp /mnt/usr/mdec/bootsd /mnt/boot diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md index 96691618553..781eee3cc99 100644 --- a/distrib/mvme88k/ramdisk/install.md +++ b/distrib/mvme88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.36 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.37 2009/06/04 00:44:47 krw Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -32,7 +32,6 @@ # MDTERM=vt100 -ARCH=ARCH NCPU=$(sysctl -n hw.ncpufound) ((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } diff --git a/distrib/mvmeppc/ramdisk/install.md b/distrib/mvmeppc/ramdisk/install.md index e9c1e956713..5abfa098389 100644 --- a/distrib/mvmeppc/ramdisk/install.md +++ b/distrib/mvmeppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.24 2008/06/26 05:42:04 ray Exp $ +# $OpenBSD: install.md,v 1.25 2009/06/04 00:44:47 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -32,8 +32,6 @@ # machine dependent section of installation/upgrade script. # -ARCH=ARCH - md_installboot() { } diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md index a1771c78291..db4d68be711 100644 --- a/distrib/sgi/ramdisk/install.md +++ b/distrib/sgi/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.19 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.20 2009/06/04 00:44:47 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -32,7 +32,6 @@ # machine dependent section of installation/upgrade script. # -ARCH=ARCH IPARCH=`sysctl -n hw.model` MDSETS="bsd.${IPARCH} bsd.rd.${IPARCH}" diff --git a/distrib/socppc/ramdisk/install.md b/distrib/socppc/ramdisk/install.md index e7b69019206..da2f00b5d42 100644 --- a/distrib/socppc/ramdisk/install.md +++ b/distrib/socppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.9 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.10 2009/06/04 00:44:47 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -32,8 +32,6 @@ # machine dependent section of installation/upgrade script. # -ARCH=ARCH - md_installboot() { } diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index 48389a6c7a7..ea268b19655 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.63 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.64 2009/06/04 00:44:47 krw Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -36,7 +36,6 @@ MDTERM=sun MDXDM=y MDDKDEVS='/^sd[0-9] /s/ .*//p;/^x[dy][0-9] /s/ .*//p' -ARCH=ARCH md_installboot() { local _prefix diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md index 74737b92ac2..368b7e541c0 100644 --- a/distrib/sparc64/common/install.md +++ b/distrib/sparc64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.32 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.33 2009/06/04 00:44:47 krw Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -36,7 +36,6 @@ MDTERM=sun MDXAPERTURE=1 MDXDM=y -ARCH=ARCH NCPU=$(sysctl -n hw.ncpufound) ((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } diff --git a/distrib/vax/install.md b/distrib/vax/install.md index 3c609c2f631..b884055f441 100644 --- a/distrib/vax/install.md +++ b/distrib/vax/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.34 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.35 2009/06/04 00:44:48 krw Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -37,7 +37,6 @@ MDTERM=vt100 MDDKDEVS='/^[hs]d[0-9] /s/ .*//p;/^r[al][0-9] /s/ .*//p' MDCDDEVS='/^cd[0-9] /s/ .*//p;/^ra[0-9] .* RRD40$/s/ .*//p' MDMTDEVS='/^[cms]t[0-9][0-9]* /s/ .*//p;/^ts[0-9]0-9]* /s/ .*//p' -ARCH=ARCH md_installboot() { cp /mnt/usr/mdec/boot /mnt/boot diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md index 3a27afa6b63..e9bbf7e96e0 100644 --- a/distrib/zaurus/ramdisk/install.md +++ b/distrib/zaurus/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.22 2009/06/02 16:23:45 krw Exp $ +# $OpenBSD: install.md,v 1.23 2009/06/04 00:44:48 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -33,7 +33,6 @@ # MDXDM=y -ARCH=ARCH md_installboot() { } |