From: rahnds <rahnds@openbsd.org>
Date: Tue, 18 Feb 1997 15:46:37 +0000 (+0000)
Subject: commit some stragglers in my source tree, cleaning up of ramdisk installation.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6def1508493f9e93871bd9e8c53d870654ceedd5;p=openbsd

commit some stragglers in my source tree, cleaning up of ramdisk installation.
---

diff --git a/distrib/powerpc/Makefile b/distrib/powerpc/Makefile
index fe723e28ea4..f60e60afe16 100644
--- a/distrib/powerpc/Makefile
+++ b/distrib/powerpc/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.1 1995/07/18 04:12:51 briggs Exp $
 
-SUBDIR= inst kc
+SUBDIR= miniroot
 
 .include <bsd.subdir.mk>
diff --git a/distrib/powerpc/miniroot/Makefile b/distrib/powerpc/miniroot/Makefile
index e5222e55bad..62af4dbf249 100644
--- a/distrib/powerpc/miniroot/Makefile
+++ b/distrib/powerpc/miniroot/Makefile
@@ -6,10 +6,12 @@ TOP=		${.CURDIR}/..
 IMAGE=		miniroot-${REV}.fs
 CRUNCHCONF?=    ${TOP}/miniroot/${CBIN}.conf
 BASE=miniroot
+KERNEL=		${SRCSYSDIR}/arch/powerpc/compile/MINI/bsd
 
 MOUNT_POINT=	/mnt1
 BDEV=		/dev/rd0a
-CDEV=		/dev/rrd0c
+CDEV=		/dev/rrd0a
+RDEV=		/dev/rd0c
 
 .include "${TOP}/inst-common/Makefile.inc"
 
@@ -28,13 +30,22 @@ ${IMAGE}:	do_prep do_mount do_files do_umount_copy do_unconfig
 	rm rd.pid;\
 	fi
 
+elfrdsetroot:	${TOP}//elfrdsetroot.c
+	${HOSTCC} -o elfrdsetroot ${TOP}/elfrdsetroot.c
+
+setroot: ${IMAGE} bsd elfrdsetroot
+	elfrdsetroot bsd < ${IMAGE}
+
+bsd:	${KERNEL}
+	cp ${KERNEL} bsd
+
 do_prep: ${CBIN} do_unconfig
-	sh ${.CURDIR}/start_rdconfig.sh ${CDEV} ${NBLKS}
+	sh ${.CURDIR}/start_rdconfig.sh ${RDEV} ${NBLKS}
 	dd if=/usr/mdec/sdboot of=${CDEV}
 	disklabel -w ${CDEV} ${DISKTYPE}
 	
 do_mount:
-	-newfs ${NEWFSARGS} -s ${NBLKS} ${BDEV} ${DISKTYPE}
+	-newfs ${NEWFSARGS} -s ${NBLKS} ${CDEV} ${DISKTYPE}
 	mount ${BDEV} ${MOUNT_POINT}
  
 do_umount_copy:
diff --git a/distrib/powerpc/miniroot/install.sub b/distrib/powerpc/miniroot/install.sub
index 756940fe1c9..23f6e95ec1b 100644
--- a/distrib/powerpc/miniroot/install.sub
+++ b/distrib/powerpc/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sub,v 1.2 1997/02/17 17:00:05 rahnds Exp $
+#	$OpenBSD: install.sub,v 1.3 1997/02/18 15:46:38 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.
@@ -655,7 +655,7 @@ install_from_mounted_fs() {
 		fi
 
 		# Extract file
-		cat $_filename | (cd /mnt; tar --unlink -zxvpf -)
+		cat $_filename | (cd /mnt; pax -r -pe -z )
 		echo "Extraction complete."
 		_setsdone="$_f $_setsdone"
 
@@ -1011,11 +1011,11 @@ __install_tape_2
 		getresp "1"
 		case "$resp" in
 		1)
-			_xcmd="tar --unlink -zxvpf -"
+			_xcmd="pax -r -pe -z"
 			;;
 
 		2)
-			_xcmd="tar --unlink -xvpf -"
+			_xcmd="pax -r -pe"
 			;;
 
 		*)