diff options
-rw-r--r-- | distrib/amd64/common/install.md | 10 | ||||
-rw-r--r-- | distrib/cats/ramdisk/install.md | 20 | ||||
-rw-r--r-- | distrib/i386/common/install.md | 12 | ||||
-rw-r--r-- | distrib/macppc/ramdisk/install.md | 22 | ||||
-rw-r--r-- | distrib/sgi/ramdisk/install.md | 14 | ||||
-rw-r--r-- | distrib/zaurus/ramdisk/install.md | 10 |
6 files changed, 44 insertions, 44 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 12fa4b96bbc..f5f41c3b302 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.5 2005/03/27 15:13:49 krw Exp $ +# $OpenBSD: install.md,v 1.6 2005/04/02 14:34:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ md_prep_fdisk() { ask_yn "Do you want to use *all* of $_disk for OpenBSD?" if [[ $resp == y ]]; then echo -n "Putting all of $_disk into an active OpenBSD MBR partition (type 'A6')..." - fdisk -e ${_disk} << __EOT > /dev/null + fdisk -e ${_disk} <<__EOT >/dev/null reinit update write @@ -83,7 +83,7 @@ __EOT fi # Manually configure the MBR. - cat << __EOT + cat <<__EOT You will now create a single MBR partition to contain your OpenBSD data. This partition must have an id of 'A6'; must *NOT* overlap other partitions; and @@ -95,7 +95,7 @@ $(fdisk ${_disk}) __EOT fdisk -e ${_disk} - cat << __EOT + cat <<__EOT Here is the partition information you chose: $(fdisk ${_disk}) @@ -107,7 +107,7 @@ md_prep_disklabel() { md_prep_fdisk $_disk - cat << __EOT + cat <<__EOT You will now create an OpenBSD disklabel inside the OpenBSD MBR partition. The disklabel defines how OpenBSD splits up the MBR partition diff --git a/distrib/cats/ramdisk/install.md b/distrib/cats/ramdisk/install.md index 44ee7e7df7f..ccd2cc19f8c 100644 --- a/distrib/cats/ramdisk/install.md +++ b/distrib/cats/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.9 2005/03/27 15:13:49 krw Exp $ +# $OpenBSD: install.md,v 1.10 2005/04/02 14:34:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ md_prep_disk() { local _disk=$1 _resp typeset -l _resp - cat << __EOT + cat <<__EOT $_disk must be partitioned using an BSD or an MBR partition table. @@ -79,7 +79,7 @@ md_prep_MBR() { local _disk=$1 if [[ -n $(disklabel -c $_disk 2>/dev/null | grep ' BSD ') ]]; then - cat << __EOT + cat <<__EOT WARNING: putting an MBR partition table on $_disk will DESTROY the existing BSD partitions and BSD partition table. @@ -92,7 +92,7 @@ __EOT ask_yn "Use *all* of $_disk for OpenBSD?" if [[ $resp == y ]]; then echo -n "Creating Master Boot Record (MBR)..." - fdisk -e $_disk >/dev/null 2>&1 << __EOT + fdisk -e $_disk >/dev/null 2>&1 <<__EOT reinit update write @@ -101,7 +101,7 @@ __EOT echo "done." echo -n "Formatting 1MB MSDOS boot partition..." - gunzip < /usr/mdec/msdos1mb.gz | \ + gunzip </usr/mdec/msdos1mb.gz | \ dd of=/dev/r${_disk}c bs=512 seek=1 >/dev/null 2>&1 echo "done." @@ -110,7 +110,7 @@ __EOT # Manual MBR setup. The user is basically on their own. Give a few # hints and let the user rip. - cat << __EOT + cat <<__EOT **** NOTE **** @@ -126,7 +126,7 @@ __EOT fdisk -e $_disk - cat << __EOT + cat <<__EOT Here is the MBR configuration you chose: $(fdisk $_disk) @@ -141,7 +141,7 @@ __EOT md_prep_BSD() { local _disk=$1 - cat << __EOT + cat <<__EOT No special setup should be required to label using BSD disklabel. however if the disk has previously been partitioned in another @@ -163,7 +163,7 @@ md_prep_disklabel() { case $disklabeltype in BSD) ;; - MBR) cat << __EOT + MBR) cat <<__EOT You *MUST* setup the OpenBSD disklabel to include the MSDOS-formatted boot partition as the 'i' partition. If the 'i' partition is missing or not the @@ -182,7 +182,7 @@ __EOT } md_congrats() { - cat << __EOT + cat <<__EOT Once the machine has rebooted use OpenFirmware to boot into OpenBSD, as described in the INSTALL.$ARCH document. The command to boot OpenBSD will be diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md index 815a00fed5f..d3b94971801 100644 --- a/distrib/i386/common/install.md +++ b/distrib/i386/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.27 2005/03/27 15:13:50 krw Exp $ +# $OpenBSD: install.md,v 1.28 2005/04/02 14:34:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -49,7 +49,7 @@ md_installboot() { echo Installing boot block... # LBA biosboot uses /boot's i-node number. Using 'cat' preserves that # number, so multiboot setups (NTLDR) can work across upgrades. - cat /usr/mdec/boot > /mnt/boot + cat /usr/mdec/boot >/mnt/boot /usr/mdec/installboot -v /mnt/boot /usr/mdec/biosboot ${1} echo "done." } @@ -74,7 +74,7 @@ md_prep_fdisk() { ask_yn "Do you want to use *all* of $_disk for OpenBSD?" if [[ $resp == y ]]; then echo -n "Putting all of $_disk into an active OpenBSD MBR partition (type 'A6')..." - fdisk -e ${_disk} << __EOT > /dev/null + fdisk -e ${_disk} <<__EOT >/dev/null reinit update write @@ -85,7 +85,7 @@ __EOT fi # Manually configure the MBR. - cat << __EOT + cat <<__EOT You will now create a single MBR partition to contain your OpenBSD data. This partition must have an id of 'A6'; must *NOT* overlap other partitions; and @@ -97,7 +97,7 @@ $(fdisk ${_disk}) __EOT fdisk -e ${_disk} - cat << __EOT + cat <<__EOT Here is the partition information you chose: $(fdisk ${_disk}) @@ -109,7 +109,7 @@ md_prep_disklabel() { md_prep_fdisk $_disk - cat << __EOT + cat <<__EOT You will now create an OpenBSD disklabel inside the OpenBSD MBR partition. The disklabel defines how OpenBSD splits up the MBR partition diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md index 04a918d0e07..122b4eaba12 100644 --- a/distrib/macppc/ramdisk/install.md +++ b/distrib/macppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.28 2005/03/27 15:13:50 krw Exp $ +# $OpenBSD: install.md,v 1.29 2005/04/02 14:34:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ md_prep_disk() { local _disk=$1 _resp typeset -l _resp - cat << __EOT + cat <<__EOT $_disk must be partitioned using an HFS or an MBR partition table. @@ -97,7 +97,7 @@ md_prep_MBR() { local _disk=$1 if [[ -n $(disklabel -c $_disk 2>/dev/null | grep ' HFS ') ]]; then - cat << __EOT + cat <<__EOT WARNING: putting an MBR partition table on $_disk will DESTROY the existing HFS partitions and HFS partition table. @@ -110,7 +110,7 @@ __EOT ask_yn "Use *all* of $_disk for OpenBSD?" if [[ $resp == y ]]; then echo -n "Creating Master Boot Record (MBR)..." - fdisk -e $_disk >/dev/null 2>&1 << __EOT + fdisk -e $_disk >/dev/null 2>&1 <<__EOT reinit update write @@ -119,7 +119,7 @@ __EOT echo "done." echo -n "Formatting 1MB MSDOS boot partition..." - gunzip < /usr/mdec/msdos1mb.gz | \ + gunzip </usr/mdec/msdos1mb.gz | \ dd of=/dev/r${_disk}c bs=512 seek=1 >/dev/null 2>&1 echo "done." @@ -128,7 +128,7 @@ __EOT # Manual MBR setup. The user is basically on their own. Give a few # hints and let the user rip. - cat << __EOT + cat <<__EOT **** NOTE **** @@ -151,7 +151,7 @@ __EOT fdisk -e $_disk - cat << __EOT + cat <<__EOT Here is the MBR configuration you chose: $(fdisk $_disk) @@ -166,7 +166,7 @@ __EOT md_prep_HFS() { local _disk=$1 - cat << __EOT + cat <<__EOT You must modify an existing partition to be of type "OpenBSD" and have the name "OpenBSD". If the partition does not exist you must create it with the Apple @@ -184,7 +184,7 @@ md_prep_disklabel() { case $disklabeltype in HFS) ;; - MBR) cat << __EOT + MBR) cat <<__EOT You *MUST* setup the OpenBSD disklabel to include the MSDOS-formatted boot partition as the 'i' partition. If the 'i' partition is missing or not the @@ -204,7 +204,7 @@ __EOT md_congrats() { if [[ $disklabeltype == HFS ]]; then - cat << __EOT + cat <<__EOT To boot OpenBSD, the 'ofwboot' program must be present in the first HFS partition of $ROOTDISK. If it is not currently present you must boot MacOS and @@ -213,7 +213,7 @@ machine. __EOT fi - cat << __EOT + cat <<__EOT Once the machine has rebooted use Open Firmware to boot into OpenBSD, as described in the INSTALL.$ARCH document. The command to boot OpenBSD will diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md index 5ea3023d76e..580c4258c7b 100644 --- a/distrib/sgi/ramdisk/install.md +++ b/distrib/sgi/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.4 2005/03/27 15:13:50 krw Exp $ +# $OpenBSD: install.md,v 1.5 2005/04/02 14:34:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ md_checkfordisklabel() { # $1 is the disk to check local rval - disklabel $1 > /dev/null 2> /tmp/checkfordisklabel + disklabel $1 >/dev/null 2>/tmp/checkfordisklabel if grep "no disk label" /tmp/checkfordisklabel; then rval=1 elif grep "disk label corrupted" /tmp/checkfordisklabel; then @@ -70,10 +70,10 @@ md_prep_disklabel() _disk=$1 echo echo "Checking SGI Volume Header:" - /usr/mdec/sgivol -q $_disk > /dev/null 2> /dev/null + /usr/mdec/sgivol -q $_disk >/dev/null 2>/dev/null case $? in 0) /usr/mdec/sgivol $_disk - cat << __EOT + cat <<__EOT A SGI Volume Header was found on the disk. Normally you want to replace it with a new Volume Header suitable for installing OpenBSD. Doing this will @@ -85,7 +85,7 @@ __EOT /usr/mdec/sgivol -qi $_disk ;; n*|N*) - cat << __EOT + cat <<__EOT If the Volume Header was installed by a previous OpenBSD install keeping it is OK as long as the Volume Header has room for the 'boot' program. @@ -148,7 +148,7 @@ __EOT ;; esac - cat << __EOT + cat <<__EOT You will now create an OpenBSD disklabel. The default disklabel have an 'a' partition which is the space available for OpenBSD. The 'i' partition must @@ -171,7 +171,7 @@ __EOT } md_congrats() { - cat << __EOT + cat <<__EOT Your machine is now set up to boot OpenBSD. Normally the ARCS PROM will set up the system to boot from the first disk found with a valid Volume diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md index d121b2b1e9c..cbd9b598209 100644 --- a/distrib/zaurus/ramdisk/install.md +++ b/distrib/zaurus/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.3 2005/03/27 15:13:50 krw Exp $ +# $OpenBSD: install.md,v 1.4 2005/04/02 14:34:46 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ md_prep_fdisk() { ask_yn "Do you want to use *all* of $_disk for OpenBSD?" if [[ $resp == y ]]; then echo -n "Putting all of $_disk into an active OpenBSD MBR partition (type 'A6')..." - fdisk -e ${_disk} << __EOT > /dev/null + fdisk -e ${_disk} <<__EOT >/dev/null reinit update write @@ -77,7 +77,7 @@ __EOT fi # Manually configure the MBR. - cat << __EOT + cat <<__EOT You will now create a single MBR partition to contain your OpenBSD data. This partition must have an id of 'A6'; must *NOT* overlap other partitions; and @@ -89,7 +89,7 @@ $(fdisk ${_disk}) __EOT fdisk -e ${_disk} - cat << __EOT + cat <<__EOT Here is the partition information you chose: $(fdisk ${_disk}) @@ -101,7 +101,7 @@ md_prep_disklabel() { md_prep_fdisk $_disk - cat << __EOT + cat <<__EOT You will now create an OpenBSD disklabel inside the OpenBSD MBR partition. The disklabel defines how OpenBSD splits up the MBR partition |