[Midnightbsd-cvs] src: src/release: Add geom paths to fixit.profile.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Add geom paths to fixit.profile.

Add support for 3rd package cd since kde/gnome stuff is so huge.

Tags:
----
RELENG_0_2

Modified Files:
--------------
    src/release:
        Makefile (r1.17 -> r1.17.2.1)
        fixit.profile (r1.3 -> r1.3.4.1)

-------------- next part --------------
Index: fixit.profile
===================================================================
RCS file: /home/cvs/src/release/fixit.profile,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -L release/fixit.profile -L release/fixit.profile -u -r1.3 -r1.3.4.1
--- release/fixit.profile
+++ release/fixit.profile
@@ -9,6 +9,7 @@
 export SCSI_MODES="/mnt2/usr/share/misc/scsi_modes"
 # the root MFS doesn't have /dev/nrsa0, pick a better default for mt(1)
 export TAPE=/mnt2/dev/nrsa0
+export GEOM_LIBRARY_PATH="/mnt2/lib/geom:/lib/geom"
 
 alias ls="ls -F"
 alias ll="ls -l"
Index: Makefile
===================================================================
RCS file: /home/cvs/src/release/Makefile,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -L release/Makefile -L release/Makefile -u -r1.17 -r1.17.2.1
--- release/Makefile
+++ release/Makefile
@@ -243,6 +243,7 @@
 CD_BOOT=		${CD}/bootonly
 CD_DISC1=		${CD}/disc1
 CD_DISC2=		${CD}/disc2
+CD_DISC3=		${CD}/disc3
 .if defined(SEPARATE_LIVEFS)
 CD_LIVEFS=		${CD}/livefs
 .else
@@ -915,7 +916,7 @@
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
 	touch ${.TARGET}
 
-# Build disc1 and disc2 cdrom images
+# Build disc1, disc2, and disc3 cdrom images
 cdrom.2:
 	@echo "Building CDROM disc1 filesystem image"
 	@mkdir -p ${CD_DISC1}/${BUILDNAME}
@@ -949,6 +950,10 @@
 	@mkdir -p ${CD_DISC2}
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
 	@echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf
+	@echo "Building CDROM disc3 filesystem image"
+	@mkdir -p ${CD_DISC3}
+	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC3}/cdrom.inf
+	@echo "CD_VOLUME = 3" >> ${CD_DISC3}/cdrom.inf
 .if !defined(NODOC)
 	@mkdir -p ${CD_DISC2}/usr/share/doc
 	@for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \
@@ -988,6 +993,8 @@
 .if exists(${CD_PACKAGE_TREE}/disc2)
 CD_DISC2_PKGS=	${CD_PACKAGE_TREE}/disc2
 .endif
+.if exists(${CD_PACKAGE_TREE}/disc3)
+CD_DISC3_PKGS=	${CD_PACKAGE_TREE}/disc3
 .endif
 .endif
 
@@ -1007,6 +1014,10 @@
 	    MidnightBSD_Packages \
 	    ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \
 	    ${CD_DISC2_PKGS}
+	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
+	    MidnightBSD_Packages_2 \
+	    ${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DISC3} \
+	    ${CD_DISC3_PKGS}
 .if defined(SEPARATE_LIVEFS)
 	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
 	    MidnightBSD_LiveFS \