From f558d9fca73ca71a95bef53cfcdcd0ef79812591 Mon Sep 17 00:00:00 2001
From: mhitch <mhitch@NetBSD.org>
Date: Mon, 17 Dec 2001 05:59:20 +0000
Subject: [PATCH] Change to use the new two-stage boot loader when building the
 miniroot filesystem.

---
 distrib/amiga/miniroot/Makefile.inc | 4 ++--
 distrib/amiga/miniroot/install.md   | 4 ++--
 distrib/amiga/miniroot/list         | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/distrib/amiga/miniroot/Makefile.inc b/distrib/amiga/miniroot/Makefile.inc
index cb9ca9c33e53..4d3b07e48374 100644
--- a/distrib/amiga/miniroot/Makefile.inc
+++ b/distrib/amiga/miniroot/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2001/12/17 05:57:33 mhitch Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2001/12/17 05:59:20 mhitch Exp $
 
 VND=		vnd0
 IMAGESIZE?=	8192 # 512 byte blocks
@@ -8,4 +8,4 @@ DISKTYPE?=	miniroot
 #
 # install bootblock, so that we can boot from there
 #
-BOOTINSTALL=dd if=${DESTDIR}/usr/mdec/xxboot of=${VND_RDEV} bs=8192
+BOOTINSTALL=dd if=${DESTDIR}/usr/mdec/bootxx_ffs of=${VND_RDEV} bs=8192
diff --git a/distrib/amiga/miniroot/install.md b/distrib/amiga/miniroot/install.md
index a61c0b63478e..c10415f75df1 100644
--- a/distrib/amiga/miniroot/install.md
+++ b/distrib/amiga/miniroot/install.md
@@ -1,4 +1,4 @@
-#	$NetBSD: install.md,v 1.15 2001/07/26 21:58:46 is Exp $
+#	$NetBSD: install.md,v 1.16 2001/12/17 05:59:20 mhitch Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@ md_installboot() {
 		case "$resp" in
 			y*|Y*)
 				echo "Installing boot block..."
-				chroot /mnt /usr/mdec/installboot /usr/mdec/xxboot /dev/r${1}a
+				chroot /mnt /usr/mdec/installboot /usr/mdec/bootxx_ffs /dev/r${1}a
 				;;
 			*)
 				echo "No bootblock installed."
diff --git a/distrib/amiga/miniroot/list b/distrib/amiga/miniroot/list
index ed103426677a..f45cbe0021be 100644
--- a/distrib/amiga/miniroot/list
+++ b/distrib/amiga/miniroot/list
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.11 2000/09/19 18:26:13 is Exp $
+#	$NetBSD: list,v 1.12 2001/12/17 05:59:20 mhitch Exp $
 
 # Amiga extra's
 LINK	instbin			sbin/mount_ados
@@ -51,5 +51,8 @@ COPYDIR	${DESTDIR}/usr/share/keymaps/amiga	usr/share/keymaps/amiga
 # ??? -is
 SPECIAL	rmdir usr/share/zoneinfo
 
+# boot loader
+COPY	${DESTDIR}/boot.amiga		boot.amiga
+
 # install kernel
 COPY	${KERNOBJDIR:-${CURDIR}/../../sys/arch/amiga/compile}/INSTALL/netbsd	netbsd