From 9bc245fb48363aaae2bc60d98e330721accb976e Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sun, 29 Jan 2006 20:16:25 +0000 Subject: [PATCH] Fix the missing CD_VOLUME=1 in the cdrom.inf file on disc1 for the livecd != disc1 case (i.e. ia64). The line was appended to the non-existing cdrom.inf file, which was created only later. Move the line to after the file is created. MFC after: 1 day --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 2b314f581c24..30884542b8d4 100644 --- a/release/Makefile +++ b/release/Makefile @@ -963,11 +963,11 @@ cdrom.2: @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM .endif - @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf .if defined(SEPARATE_LIVEFS) @cp -Rp ${CD_LIVEFS}/boot ${CD_DISC1} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf .endif + @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf @echo "Building CDROM disc2 filesystem image" @mkdir -p ${CD_DISC2} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf