From 4fba3387bc7087caec5ae23adaafa6b6eeec5bbb Mon Sep 17 00:00:00 2001
From: Chris Pressey <cpressey@dragonflybsd.org>
Date: Tue, 23 Aug 2005 21:33:29 +0000
Subject: [PATCH] Make 'make upgrade' work from the LiveCD, stage 5/5:

- Have the 'make customizeiso' target in the nrelease Makefile
  populate the ISO's /etc directory with some files required by the
  'make upgrade' process, namely the Makefiles of several important
  subdirectories of /etc, and the entire architecture-specific
  subdirectory.

  Note that these extra files are not installed on the user's hard
  drive, as /etc on the ISO is only used to boot the LiveCD.
---
 nrelease/Makefile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index c1daf67843..6e19ea9034 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.39 2005/08/02 17:57:14 cpressey Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.40 2005/08/23 21:33:29 cpressey Exp $
 #
 
 ISODIR ?= /usr/release
@@ -160,6 +160,17 @@ customizeiso:
 	rm -rf `find ${ISOROOT} -type d -name CVS -print`
 	rm -rf ${ISOROOT}/usr/local/share/pristine
 	pwd_mkdb -p -d ${ISOROOT}/etc ${ISOROOT}/etc/master.passwd
+.for UPGRADE_ITEM in Makefile			\
+		     etc.${MACHINE_ARCH} 	\
+		     isdn/Makefile		\
+		     rc.d/Makefile		\
+		     periodic/Makefile		\
+		     periodic/daily/Makefile	\
+		     periodic/security/Makefile	\
+		     periodic/weekly/Makefile	\
+		     periodic/monthly/Makefile
+	cp -R ${.CURDIR}/../etc/${UPGRADE_ITEM} ${ISOROOT}/etc/${UPGRADE_ITEM}
+.endfor
 
 pkgcleaniso:
 	rm -f ${ISOROOT}/tmp/chrootscript
-- 
2.41.0