Make 'make upgrade' work from the LiveCD, stage 5/5:
authorChris Pressey <cpressey@dragonflybsd.org>
Tue, 23 Aug 2005 21:33:29 +0000 (21:33 +0000)
committerChris Pressey <cpressey@dragonflybsd.org>
Tue, 23 Aug 2005 21:33:29 +0000 (21:33 +0000)
- 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

index c1daf67..6e19ea9 100644 (file)
@@ -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
 #
 
 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
        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
 
 pkgcleaniso:
        rm -f ${ISOROOT}/tmp/chrootscript