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
This commit is contained in:
parent
8a4fabbd23
commit
9bc245fb48
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=155010
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user