From 38f590499ed80bcba7dcbf1fc159e7ef85dc884f Mon Sep 17 00:00:00 2001
From: rahnds <rahnds@openbsd.org>
Date: Fri, 21 Feb 1997 17:42:05 +0000
Subject: [PATCH] more cleanup for powerpc miniroot installation, try to allow
 install to work without awk in the miniroot.

---
 distrib/powerpc/miniroot/Makefile    |  2 +-
 distrib/powerpc/miniroot/install.md  |  6 ++++--
 distrib/powerpc/miniroot/install.sh  | 25 ++++++++++++++-----------
 distrib/powerpc/miniroot/install.sub |  4 ++--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/distrib/powerpc/miniroot/Makefile b/distrib/powerpc/miniroot/Makefile
index 62af4dbf249..a9c1a88b186 100644
--- a/distrib/powerpc/miniroot/Makefile
+++ b/distrib/powerpc/miniroot/Makefile
@@ -21,7 +21,7 @@ all: ${CBIN} ${IMAGE}
 DISKTYPE=       rdroot
 NBLKS=          4096
 # old format, minfree, opt, b/i  trks, sects, cpg
-NEWFSARGS= -t ffs -m 0 -o space -u 32 -c 16
+NEWFSARGS= -t ffs -m 0 -o space -c 16
 
 ${IMAGE}:	do_prep do_mount do_files do_umount_copy do_unconfig
 	mv -f ${IMAGE}.tmp ${IMAGE}
diff --git a/distrib/powerpc/miniroot/install.md b/distrib/powerpc/miniroot/install.md
index c67c6b81c51..f9e2c140425 100644
--- a/distrib/powerpc/miniroot/install.md
+++ b/distrib/powerpc/miniroot/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.2 1997/02/06 07:07:11 rahnds Exp $
+#       $OpenBSD: install.md,v 1.3 1997/02/21 17:42:07 rahnds Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -75,7 +75,7 @@ md_get_partition_range() {
 }
 
 md_installboot() {
-	echo "Nothing to do."
+	echo "This must be done later by hand"
 }
 md_labeldisk() {
 	echo "huh"
@@ -257,6 +257,8 @@ __congratulations_1
 
 md_native_fstype() {
 }
+md_native_fsopts() {
+}
 
 md_makerootwritable() {
 	# 2048 is the size in DEV_BIZE blocks
diff --git a/distrib/powerpc/miniroot/install.sh b/distrib/powerpc/miniroot/install.sh
index 1fc919a7b93..806e137bb26 100644
--- a/distrib/powerpc/miniroot/install.sh
+++ b/distrib/powerpc/miniroot/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.1 1997/01/31 05:11:05 rahnds Exp $
+#	$OpenBSD: install.sh,v 1.2 1997/02/21 17:42:09 rahnds Exp $
 #	$NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -386,16 +386,19 @@ install_sets $ALLSETS $MDSETS
 		ln -s /usr/share/zoneinfo/$TZ /mnt/etc/localtime
 		echo "done."
 	fi
-	if [ ! -x /mnt/dev/MAKEDEV ]; then
-		echo "No /dev/MAKEDEV installed, something is wrong here..."
-	else
-		echo -n "Making devices..."
-		pid=`twiddle`
-		cd /mnt/dev
-		sh MAKEDEV all
-		kill $pid
-		echo "done."
-	fi
+	
+	echo "if dev.tar.gz was not extracted it will be necessary"
+	echo "to go to /mnt/dev and run \"sh MAKEDEV all\""
+#	if [ ! -x /mnt/dev/MAKEDEV ]; then
+#		echo "No /dev/MAKEDEV installed, something is wrong here..."
+#	else
+#		echo -n "Making devices..."
+#		pid=`twiddle`
+#		cd /mnt/dev
+#		sh MAKEDEV all
+#		kill $pid
+#		echo "done."
+#	fi
 	md_copy_kernel
 
 	md_installboot ${ROOTDISK}
diff --git a/distrib/powerpc/miniroot/install.sub b/distrib/powerpc/miniroot/install.sub
index 1575e1c7e17..05494870cbc 100644
--- a/distrib/powerpc/miniroot/install.sub
+++ b/distrib/powerpc/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sub,v 1.4 1997/02/21 15:39:03 rahnds Exp $
+#	$OpenBSD: install.sub,v 1.5 1997/02/21 17:42:11 rahnds Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@ export VERSION
 
 ALLDIST="base comp etc games man misc text"	# default install sets
 ALLSNAP_1="etc games man misc text bin dev sbin"
-ALLSNAP_2="usr.bin usr.binutils usr .games usr.include"
+ALLSNAP_2="usr.bin usr.binutils usr.games usr.include bsd"
 ALLSNAP_3="usr.lib usr.libexec usr.misc usr.sbin usr.share var"
 ALLSETS="${ALLDIST} ${ALLSNAP_1} ${ALLSNAP_2} ${ALLSNAP_3}"
 
-- 
2.20.1