now that we have fictious disklabels, this becomes more like the

other ports.

1 files changed, 17 insertions, 59 deletions

diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index 31598a1750e..e915cc584fc 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$OpenBSD: install.md,v 1.7 1997/10/31 05:41:28 downsj Exp $
+#	$OpenBSD: install.md,v 1.8 1998/03/27 08:35:27 millert Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 #
 
 # Machine-dependent install sets
-MDSETS=""
+MDSETS="kernel"
 
 TMPWRITEABLE=/tmp/writeable
 KERNFSMOUNTED=/tmp/kernfsmounted
@@ -426,57 +426,25 @@ md_prep_disklabel()
 	md_checkfordisklabel $_disk
 	case "$rval" in
 	0)
-		echo -n "Do you wish to edit the disklabel on $_disk? [y] "
 		;;
 	1)
-		echo "WARNING: Disk $_disk has no label"
-		echo -n "Do you want to create one with the disklabel editor? [y] "
+		echo "WARNING: Disk $_disk has no label. You will be creating a new one."
+		echo
 		;;
 	2)
-		echo "WARNING: Label on disk $_disk is corrupted"
-		echo -n "Do you want to try and repair the damage using the disklabel editor? [y] "
+		echo "WARNING: Label on disk $_disk is corrupted. You will be repairing."
+		echo
 		;;
 	esac
 
-	getresp "y"
-	case "$resp" in
-	y*|Y*) ;;
-	*)	return ;;
-	esac
-
 	# display example
 	cat << \__md_prep_disklabel_1
 
-Here is an example of what the partition information will look like once
-you have entered the disklabel editor. Disk partition sizes and offsets
-are in sector (most likely 512 bytes) units. Make sure these size/offset
-pairs are on cylinder boundaries (the number of sector per cylinder is
-given in the `sectors/cylinder' entry, which is not shown here).
-
-For the boot disk, partition `a' must be offset one cylinder (the number
-of sectors per cylinder should be given as the offset) and partition
-`c' must have an fstype of `unused'.  Non-boot disks may start filesystems
-at offset 0.
-
-If there is no existing label on the disk, you MUST EDIT THE DISK GEOMETRY.
-Please have information on your disk at hand in order to do so.  Failure
-to correct the disk geometry will result in your system being unable to
-boot from the disk you are installing on to.  Be sure `cylinders',
-`total sectors' and `rpm' are set to something reasonable; this may be
-accomplished with the `e' command from within the disklabel editor.
-
-[Example]
-16 partitions:
-#        size   offset    fstype   [fsize bsize   cpg]
-  a:    50176     1574    4.2BSD     1024  8192    16   # (Cyl.    1 - 111)
-  b:    64512    50176      swap                        # (Cyl.  112 - 255)
-  c:   640192        0      boot                        # (Cyl.    0 - 1428)
-  d:   525504   114688    4.2BSD     1024  8192    16   # (Cyl.  256 - 1428)
-[End of example]
-
+If you are unsure of how to use multiple partitions properly
+(ie. seperating /, /usr, /tmp, /var, /usr/local, and other things)
+just split the space into a root and swap partition for now.
 __md_prep_disklabel_1
-	echo -n "Press [Enter] to continue "
-	getresp ""
+
 	disklabel -W ${_disk}
 	disklabel -E ${_disk}
 
@@ -506,23 +474,13 @@ simple and rational way.  You'll be asked several questions, and it would
 probably be useful to have your disk's hardware manual, the installation
 notes, and a calculator handy.
 
-In particular, you will need to know some reasonably detailed
-information about your disk's geometry.  This program can determine
-some limited information about certain specific types of HP-IB disks.
-If you have SCSI disks, however, prior knowledge of disk geometry
-is absolutely essential.  The kernel will attempt to display geometry
-information for SCSI disks during boot, if possible.  If you did not
-make it note of it before, you may wish to reboot and jot down your
-disk's geometry before proceeding.
-
-As with anything which modifies your hard disk's contents, this
-program can cause SIGNIFICANT data loss, and you are advised
-to make sure your hard drive is backed up before beginning the
-installation process.
-
-Default answers are displyed in brackets after the questions.
-You can hit Control-C at any time to quit, but if you do so at a
-prompt, you may have to hit return.  Also, quitting in the middle of
+As with anything which modifies your hard disk's contents, this program
+can cause SIGNIFICANT data loss, and you are advised to make sure your
+hard drive is backed up before beginning the installation process.
+
+Default answers are displyed in brackets after the questions.  You
+can hit Control-C at any time to quit, but if you do so at a prompt,
+you may have to hit return.  Also, quitting in the middle of
 installation may leave your system in an inconsistent state.
 
 __welcome_banner_1