d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the missing CD_VOLUME=1 in the cdrom.inf file on disc1 for the

Browse Source 
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
This commit is contained in:
Marcel Moolenaar 2006-01-29 20:16:25 +00:00
parent 8a4fabbd23
commit 9bc245fb48
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/Makefile
View File

@ -963,11 +963,11 @@ cdrom.2:
@mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT
@mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM
.endif .endif
@echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf
.if defined(SEPARATE_LIVEFS) .if defined(SEPARATE_LIVEFS)
@cp -Rp ${CD_LIVEFS}/boot ${CD_DISC1} @cp -Rp ${CD_LIVEFS}/boot ${CD_DISC1}
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf
.endif .endif
@echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf
@echo "Building CDROM disc2 filesystem image" @echo "Building CDROM disc2 filesystem image"
@mkdir -p ${CD_DISC2} @mkdir -p ${CD_DISC2}
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf