summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2006-01-29 20:16:25 +0000
committermarcel <marcel@FreeBSD.org>2006-01-29 20:16:25 +0000
commit3c99857fa0a333a61bab4c7f7d0bc8884aa302e3 (patch)
tree0439587b4afff55198d82f0322e303c6194dfa0b /release
parentd1df6904eb958594c3bb15485c0f67e4a8227a96 (diff)
downloadFreeBSD-src-3c99857fa0a333a61bab4c7f7d0bc8884aa302e3.zip
FreeBSD-src-3c99857fa0a333a61bab4c7f7d0bc8884aa302e3.tar.gz
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
Diffstat (limited to 'release')
-rw-r--r--release/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index 2b314f5..3088454 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
OpenPOWER on IntegriCloud