From 7ca36f68e7fb2ac24ea1ed31c5f36a8369149d13 Mon Sep 17 00:00:00 2001
From: grr <grr@openbsd.org>
Date: Wed, 30 Apr 1997 08:17:56 +0000
Subject: [PATCH] fix assorted problems with miniroot stuff

---
 distrib/sparc/install.md           | 8 ++++----
 distrib/sparc/miniroot/dot.profile | 8 ++++++++
 distrib/sparc/miniroot/list        | 2 +-
 etc/etc.sparc/MAKEDEV              | 6 +++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index 25ba0ae43a1..16308876ee3 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -89,7 +89,7 @@ md_get_ifdevs() {
 
 md_get_partition_range() {
     # return range of valid partition letters
-    echo "[a-h]"
+    echo "[a-p]"
 }
 
 md_installboot() {
@@ -156,11 +156,11 @@ pairs are on cylinder boundaries (the number of sector per cylinder is
 given in the `sectors/cylinder' entry, which is not shown here).
 
 Do not change any parameters except the partition layout and the label name.
-It's probably also wisest not to touch the `8 partitions:' line, even
-in case you have defined less than eight partitions.
+It's probably also wisest not to touch the `16 partitions:' line, even
+in case you have defined less than sixteen partitions.
 
 [Example]
-8 partitions:
+16 partitions:
 #        size   offset    fstype   [fsize bsize   cpg]
   a:    50176        0    4.2BSD     1024  8192    16   # (Cyl.    0 - 111)
   b:    64512    50176      swap                        # (Cyl.  112 - 255)
diff --git a/distrib/sparc/miniroot/dot.profile b/distrib/sparc/miniroot/dot.profile
index ddcbb3c887c..3c852f21ab6 100644
--- a/distrib/sparc/miniroot/dot.profile
+++ b/distrib/sparc/miniroot/dot.profile
@@ -32,9 +32,17 @@
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
+
 TERM=sun
 export TERM
 
+if [ -e /usr/bin/vim ]; then
+	EDITOR=vim
+else
+	EDITOR=ed
+fi
+export EDITOR
+	
 umask 022
 
 if [ "X${DONEPROFILE}" = "X" ]; then
diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list
index ca077de3e46..f5641c9d801 100644
--- a/distrib/sparc/miniroot/list
+++ b/distrib/sparc/miniroot/list
@@ -32,7 +32,7 @@ SYMLINK	/tmp	var/tmp
 COPY	${DESTDIR}/dev/MAKEDEV		dev/MAKEDEV
 COPY	${DESTDIR}/dev/MAKEDEV.local	dev/MAKEDEV.local
 SPECIAL	cd dev; sh MAKEDEV all
-SPECIAL	/bin/rm dev/MAKEDEV
+#SPECIAL	/bin/rm dev/MAKEDEV
 
 # we need the contents of /usr/mdec
 COPYDIR	${DESTDIR}/usr/mdec	usr/mdec
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index c5e82faa40f..a04e43efaa5 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.21 1997/04/29 17:26:28 niklas Exp $
+#	$OpenBSD: MAKEDEV,v 1.22 1997/04/30 08:17:56 grr Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -337,12 +337,12 @@ ccd*|sd*|xd*|xy*|cd*|vnd*)
 		done
 	fi
 	rm -f $name$unit? r$name$unit?
-	minor=`mult $unit 8`
+	minor=`mult $unit 16`
 	for slice in a b c d e f g h i j k l m n o p
 	do
 		dev=$name$unit$slice
 		mknod $dev b $blk $minor
-		mknod r$dev b $chr $minor
+		mknod r$dev c $chr $minor
 		minor=`add $minor 1`
 	done
 	chown root.operator $name$unit? r$name$unit?
-- 
2.20.1