dont let files patch themselves into existance multiple time, and use

the correct version.

1 files changed, 5 insertions, 567 deletions

diff --git a/distrib/cats/ramdisk/install.md b/distrib/cats/ramdisk/install.md
index 2e718155a55..c593b4727e9 100644
--- a/distrib/cats/ramdisk/install.md
+++ b/distrib/cats/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.1 2004/02/01 05:15:48 drahn Exp $
+#	$OpenBSD: install.md,v 1.2 2004/02/02 21:01:19 drahn Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -70,567 +70,16 @@ md_prep_disk() {
 
 	cat << __EOT
 
-$_disk must be partitioned using an HFS or an MBR partition table.
-
-HFS partition tables are created with MacOS. Existing partitions in the HFS
-partition table can be modified by OpenBSD for use by OpenBSD.
-
-MBR partition tables are created with OpenBSD. MacOS *cannot* be booted from a
-disk partitioned with an MBR partition table.
-
-__EOT
-
-	while : ; do
-		ask "Use HFS or MBR partition table?" HFS
-		_resp=$resp
-		case $_resp in
-		m|mbr)	export disklabeltype=MBR
-			md_prep_MBR $_disk
-			break
-			;;
-		h|hfs)	export disklabeltype=HFS
-			md_prep_HFS $_disk
-			break
-			;;
-		esac
-	done
-}
-
-md_prep_MBR() {
-	local _disk=$1
-
-	if [[ -n $(disklabel -c $_disk 2>/dev/null | grep ' HFS ') ]]; then
-		cat << __EOT
-
-WARNING: putting an MBR partition table on $_disk will DESTROY the existing HFS
-         partitions and HFS partition table.
-
-__EOT
-		ask_yn "Are you *sure* you want an MBR partition table on $_disk?"
-		[[ $resp == n ]] && exit
-	fi
-
-	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
-reinit
-update
-write
-quit
-__EOT
-		echo "done."
-
-		echo -n "Formatting 1MB MSDOS boot partition..."
-		gunzip < /usr/mdec/msdos1mb.gz | \
-		    dd of=/dev/r${_disk}c bs=512 seek=1 >/dev/null 2>&1
-		echo "done."
-
-		return
-	fi
- 
-	# Manual MBR setup. The user is basically on their own. Give a few
-	# hints and let the user rip.
-	cat << __EOT
-
-**** NOTE ****
-
-A valid MBR for an OpenBSD bootable disk must contain at least:
-
-a) One DOS (id '06') partition at least 1MB in size. This is where OpenFirmware
-will look for the 'ofwboot' program used to boot OpenBSD. Consult your PowerPC
-OpenFirmware manual -and- the INSTALL.$ARCH file for directions on setting up
-this partition correctly.
-
-b) One OpenBSD (id 'A6') partition.
-
-**************
-
-Current partition information is:
-
-$(fdisk $_disk)
-
-__EOT
-
-	fdisk -e $_disk
-
-	cat << __EOT
-Here is the MBR configuration you chose:
-
-$(fdisk $_disk)
-
-Please take note of the offsets and sizes of the DOS partition, the OpenBSD
-partition, and any other partitions you want to access from OpenBSD. You will
-need this information to fill in the OpenBSD disklabel.
-
-__EOT
-}
-
-md_prep_HFS() {
-	local _disk=$1
-
-	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
-MacOS tools before attempting to install OpenBSD.
-
-__EOT
-	
-	#pdisk /dev/${_disk}c
-}
-
-md_prep_disklabel() {
-	local _disk=$1 _q
-
-	md_prep_disk $_disk
-
-	case $disklabeltype in
-	HFS)	;;
-	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
-MSDOS-formatted boot partition, then the 'ofwboot' file required to boot
-OpenBSD cannot be installed.
-
-__EOT
-		;;
-	*)	echo "Disk label type ('$disklabeltype') is not 'HFS' or 'MBR'."
-		exit
-		;;
-	esac
-
-	disklabel -W $_disk >/dev/null 2>&1
-	disklabel -c -f /tmp/fstab.$_disk -E $_disk
-}
-
-md_congrats() {
-	if [[ $disklabeltype == HFS ]]; then
-		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
-use MacOS tools to copy it from the OpenBSD install media. Then reboot the
-machine.
-__EOT
-	fi
-
-	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
-something like 'boot hd:,ofwboot /bsd'.
-
-__EOT
-}
-#	$OpenBSD: install.md,v 1.1 2004/02/01 05:15:48 drahn Exp $
-#
-#
-# Copyright (c) 1996 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Jason R. Thorpe.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#        This product includes software developed by the NetBSD
-#        Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-#
-# machine dependent section of installation/upgrade script.
-#
-
-MDFSTYPE=msdos
-MDXAPERTURE=2
-ARCH=ARCH
-
-md_set_term() {
-}
-
-md_installboot() {
-	local _disk=$1
-
-	[[ $disklabeltype == MBR ]] || return
-
-	echo -n "Copying 'ofwboot' to the boot partition (${_disk}i)..."
-	if mount -t msdos /dev/${_disk}i /mnt2 ; then
-		if cp /usr/mdec/ofwboot /mnt2; then
-			umount /mnt2
-			echo "done."
-			return
-		fi
-	fi
-
-	echo "FAILED.\nYou will not be able to boot OpenBSD from $_disk."
-	exit
-}
-
-md_prep_disk() {
-	local _disk=$1 _resp
-	typeset -l _resp
-
-	cat << __EOT
-
-$_disk must be partitioned using an HFS or an MBR partition table.
-
-HFS partition tables are created with MacOS. Existing partitions in the HFS
-partition table can be modified by OpenBSD for use by OpenBSD.
-
-MBR partition tables are created with OpenBSD. MacOS *cannot* be booted from a
-disk partitioned with an MBR partition table.
-
-__EOT
-
-	while : ; do
-		ask "Use HFS or MBR partition table?" HFS
-		_resp=$resp
-		case $_resp in
-		m|mbr)	export disklabeltype=MBR
-			md_prep_MBR $_disk
-			break
-			;;
-		h|hfs)	export disklabeltype=HFS
-			md_prep_HFS $_disk
-			break
-			;;
-		esac
-	done
-}
-
-md_prep_MBR() {
-	local _disk=$1
-
-	if [[ -n $(disklabel -c $_disk 2>/dev/null | grep ' HFS ') ]]; then
-		cat << __EOT
-
-WARNING: putting an MBR partition table on $_disk will DESTROY the existing HFS
-         partitions and HFS partition table.
-
-__EOT
-		ask_yn "Are you *sure* you want an MBR partition table on $_disk?"
-		[[ $resp == n ]] && exit
-	fi
-
-	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
-reinit
-update
-write
-quit
-__EOT
-		echo "done."
-
-		echo -n "Formatting 1MB MSDOS boot partition..."
-		gunzip < /usr/mdec/msdos1mb.gz | \
-		    dd of=/dev/r${_disk}c bs=512 seek=1 >/dev/null 2>&1
-		echo "done."
-
-		return
-	fi
- 
-	# Manual MBR setup. The user is basically on their own. Give a few
-	# hints and let the user rip.
-	cat << __EOT
-
-**** NOTE ****
-
-A valid MBR for an OpenBSD bootable disk must contain at least:
-
-a) One DOS (id '06') partition at least 1MB in size. This is where OpenFirmware
-will look for the 'ofwboot' program used to boot OpenBSD. Consult your PowerPC
-OpenFirmware manual -and- the INSTALL.$ARCH file for directions on setting up
-this partition correctly.
-
-b) One OpenBSD (id 'A6') partition.
-
-**************
-
-Current partition information is:
-
-$(fdisk $_disk)
-
-__EOT
-
-	fdisk -e $_disk
-
-	cat << __EOT
-Here is the MBR configuration you chose:
-
-$(fdisk $_disk)
-
-Please take note of the offsets and sizes of the DOS partition, the OpenBSD
-partition, and any other partitions you want to access from OpenBSD. You will
-need this information to fill in the OpenBSD disklabel.
-
-__EOT
-}
-
-md_prep_HFS() {
-	local _disk=$1
-
-	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
-MacOS tools before attempting to install OpenBSD.
-
-__EOT
-	
-	#pdisk /dev/${_disk}c
-}
-
-md_prep_disklabel() {
-	local _disk=$1 _q
-
-	md_prep_disk $_disk
-
-	case $disklabeltype in
-	HFS)	;;
-	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
-MSDOS-formatted boot partition, then the 'ofwboot' file required to boot
-OpenBSD cannot be installed.
-
-__EOT
-		;;
-	*)	echo "Disk label type ('$disklabeltype') is not 'HFS' or 'MBR'."
-		exit
-		;;
-	esac
-
-	disklabel -W $_disk >/dev/null 2>&1
-	disklabel -c -f /tmp/fstab.$_disk -E $_disk
-}
-
-md_congrats() {
-	if [[ $disklabeltype == HFS ]]; then
-		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
-use MacOS tools to copy it from the OpenBSD install media. Then reboot the
-machine.
-__EOT
-	fi
-
-	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
-something like 'boot hd:,ofwboot /bsd'.
-
-__EOT
-}
-#	$OpenBSD: install.md,v 1.1 2004/02/01 05:15:48 drahn Exp $
-#
-#
-# Copyright (c) 1996 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Jason R. Thorpe.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#        This product includes software developed by the NetBSD
-#        Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-#
-# machine dependent section of installation/upgrade script.
-#
-
-MDFSTYPE=msdos
-MDXAPERTURE=2
-ARCH=ARCH
-
-md_set_term() {
-}
-
-md_installboot() {
-	local _disk=$1
-
-	[[ $disklabeltype == MBR ]] || return
-
-	echo -n "Copying 'ofwboot' to the boot partition (${_disk}i)..."
-	if mount -t msdos /dev/${_disk}i /mnt2 ; then
-		if cp /usr/mdec/ofwboot /mnt2; then
-			umount /mnt2
-			echo "done."
-			return
-		fi
-	fi
-
-	echo "FAILED.\nYou will not be able to boot OpenBSD from $_disk."
-	exit
-}
-
-md_prep_disk() {
-	local _disk=$1 _resp
-	typeset -l _resp
-
-	cat << __EOT
-
-$_disk must be partitioned using an HFS or an MBR partition table.
-
-HFS partition tables are created with MacOS. Existing partitions in the HFS
-partition table can be modified by OpenBSD for use by OpenBSD.
+$_disk must be partitioned using an MBR partition table.
 
 MBR partition tables are created with OpenBSD. MacOS *cannot* be booted from a
 disk partitioned with an MBR partition table.
 
 __EOT
 
-	while : ; do
-		ask "Use HFS or MBR partition table?" HFS
-		_resp=$resp
-		case $_resp in
-		m|mbr)	export disklabeltype=MBR
-			md_prep_MBR $_disk
-			break
-			;;
-		h|hfs)	export disklabeltype=HFS
-			md_prep_HFS $_disk
-			break
-			;;
-		esac
-	done
+	md_prep_MBR $_disk
 }
 
-md_prep_MBR() {
-	local _disk=$1
-
-	if [[ -n $(disklabel -c $_disk 2>/dev/null | grep ' HFS ') ]]; then
-		cat << __EOT
-
-WARNING: putting an MBR partition table on $_disk will DESTROY the existing HFS
-         partitions and HFS partition table.
-
-__EOT
-		ask_yn "Are you *sure* you want an MBR partition table on $_disk?"
-		[[ $resp == n ]] && exit
-	fi
-
-	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
-reinit
-update
-write
-quit
-__EOT
-		echo "done."
-
-		echo -n "Formatting 1MB MSDOS boot partition..."
-		gunzip < /usr/mdec/msdos1mb.gz | \
-		    dd of=/dev/r${_disk}c bs=512 seek=1 >/dev/null 2>&1
-		echo "done."
-
-		return
-	fi
- 
-	# Manual MBR setup. The user is basically on their own. Give a few
-	# hints and let the user rip.
-	cat << __EOT
-
-**** NOTE ****
-
-A valid MBR for an OpenBSD bootable disk must contain at least:
-
-a) One DOS (id '06') partition at least 1MB in size. This is where OpenFirmware
-will look for the 'ofwboot' program used to boot OpenBSD. Consult your PowerPC
-OpenFirmware manual -and- the INSTALL.$ARCH file for directions on setting up
-this partition correctly.
-
-b) One OpenBSD (id 'A6') partition.
-
-**************
-
-Current partition information is:
-
-$(fdisk $_disk)
-
-__EOT
-
-	fdisk -e $_disk
-
-	cat << __EOT
-Here is the MBR configuration you chose:
-
-$(fdisk $_disk)
-
-Please take note of the offsets and sizes of the DOS partition, the OpenBSD
-partition, and any other partitions you want to access from OpenBSD. You will
-need this information to fill in the OpenBSD disklabel.
-
-__EOT
-}
-
-md_prep_HFS() {
-	local _disk=$1
-
-	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
-MacOS tools before attempting to install OpenBSD.
-
-__EOT
-	
-	pdisk /dev/${_disk}c
-}
 
 md_prep_disklabel() {
 	local _disk=$1 _q
@@ -638,7 +87,6 @@ md_prep_disklabel() {
 	md_prep_disk $_disk
 
 	case $disklabeltype in
-	HFS)	;;
 	MBR)	cat << __EOT
 
 You *MUST* setup the OpenBSD disklabel to include the MSDOS-formatted boot
@@ -648,7 +96,7 @@ OpenBSD cannot be installed.
 
 __EOT
 		;;
-	*)	echo "Disk label type ('$disklabeltype') is not 'HFS' or 'MBR'."
+	*)	echo "Disk label type ('$disklabeltype') is not 'MBR'."
 		exit
 		;;
 	esac
@@ -658,21 +106,11 @@ __EOT
 }
 
 md_congrats() {
-	if [[ $disklabeltype == HFS ]]; then
-		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
-use MacOS tools to copy it from the OpenBSD install media. Then reboot the
-machine.
-__EOT
-	fi
-
 	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
-something like 'boot hd:,ofwboot /bsd'.
+something like 'boot (hd0)bsd'.
 
 __EOT
 }