From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Tue, 17 Jan 2006 23:52:20 +0000 (+0000)
Subject: Add mk.conf to the ISO and have the installer install it in /etc
X-Git-Tag: v2.0.1~5372
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/dddbd61597a40c5a49f938300fd345fa83d33017

Add mk.conf to the ISO and have the installer install it in /etc
on the HDD.
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 9295365ff2..a39b11b0cf 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.50 2005/12/29 20:18:58 dillon Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.51 2006/01/17 23:52:20 dillon Exp $
 #
 
 # compat target
@@ -125,6 +125,7 @@ buildiso:
 	( cd ${.CURDIR}/..; make DESTDIR=${ISOROOT} installworld )
 	( cd ${.CURDIR}/../etc; MAKEOBJDIRPREFIX=${NRLOBJDIR}/nrelease \
 		make -m ${.CURDIR}/../share/mk DESTDIR=${ISOROOT} distribution )
+	cp -p ${.CURDIR}/mk.conf.pkgsrc ${ISOROOT}/etc/mk.conf
 	cpdup ${ISOROOT}/etc ${ISOROOT}/etc.hdd
 	( cd ${.CURDIR}/..; make DESTDIR=${ISOROOT} \
 		installkernel KERNCONF=${KERNCONF} )