From f6c08bce8e1e4ff8ccbf9c5ed0553915fd8b13dd Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 23 Dec 2005 20:29:57 +0000
Subject: [PATCH] Fix the installer_quickrel target.  Also fix the pkgsrc
 bootstrap, not enough data was being copied into ISOROOT to run the
 bootstrap.

---
 nrelease/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 4e2f5c9de8..54091f6dc3 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -1,9 +1,9 @@
-# $DragonFly: src/nrelease/Makefile,v 1.48 2005/12/22 23:23:32 dillon Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.49 2005/12/23 20:29:57 dillon Exp $
 #
 
 # compat target
 installer_release: release
-installer_quickrel: 
+installer_quickrel: quickrel
 installer_realquickrel: realquickrel
 installer_fetch: fetch
 
@@ -127,8 +127,9 @@ customizeiso:
 .for ROOTSKEL in ${ROOTSKELS}
 	cpdup -X cpignore -o ${ROOTSKEL} ${ISOROOT}
 .endfor
-	cpdup ${PKGSRC_PKG_PATH}/${PKGSRC_BOOTSTRAP_KIT}/bootstrap ${ISOROOT}/tmp/bootstrap
-	chroot ${ISOROOT} csh -c "cd /tmp/bootstrap; ./bootstrap"
+	rm -rf ${ISOROOT}/tmp/bootstrap ${ISOROOT}/usr/obj/pkgsrc
+	cpdup ${PKGSRC_PKG_PATH}/${PKGSRC_BOOTSTRAP_KIT} ${ISOROOT}/tmp/bootstrap
+	chroot ${ISOROOT} csh -c "cd /tmp/bootstrap/bootstrap; ./bootstrap"
 	rm -rf ${ISOROOT}/tmp/bootstrap ${ISOROOT}/usr/obj/pkgsrc
 	rm -rf `find ${ISOROOT} -type d -name CVS -print`
 	rm -rf ${ISOROOT}/usr/local/share/pristine
-- 
2.41.0