runtime is images/install.img, or LiveOS/squashfs.img on boot.iso

rename the runtime image in the tree and on the ISO.
This commit is contained in:
Will Woods 2011-06-24 17:26:01 -04:00
parent 30ac2e9aa5
commit 8122690ab9
4 changed files with 8 additions and 8 deletions

View File

@ -16,7 +16,7 @@ macboot = ""
%>
mkdir images
install ${runtime_img} images
install ${runtime_img} images/install.img
mkdir ${BOOTDIR} ${BOOTDIR}/chrp etc
install ${ANABOOTDIR}/bootinfo.txt ${BOOTDIR}
@ -87,7 +87,8 @@ runcmd usr/lib/yaboot/addnote ${outroot}/${BOOTDIR}/chrp/yaboot
mkdir isopath
copy ${BOOTDIR} isopath
copy etc isopath
copy images isopath
mkdir isopath/LiveOS
hardlink images/install.img isopath/LiveOS/squashfs.img
runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \
${prepboot} -part -hfs -T -r -l -J \
-A "${product.name} ${product.version}" -sysid PPC -V "PBOOT" \

View File

@ -5,7 +5,7 @@ KERNELDIR=BOOTDIR
%>
mkdir images
install ${runtime_img} images
install ${runtime_img} images/install.img
install boot/*.b ${BOOTDIR}
install ${ANABOOTDIR}/silo.conf ${BOOTDIR}
@ -26,5 +26,5 @@ runcmd mkisofs -R -J -T -G /${BOOTDIR}/isofs.b -B ... \
-sparc-label "${product.name} ${product.version} Boot Disc" \
-o ${outroot}/images/boot.iso \
-graft-points boot=${outroot}/${BOOTDIR} \
${runtime_img}=${outroot}/${runtime_img}
LiveOS/squashfs.img=${outroot}/images/install.img
treeinfo images-${basearch} boot.iso images/boot.iso

View File

@ -7,7 +7,7 @@ KERNELDIR=PXEBOOTDIR
%>
mkdir images
install ${runtime_img} images
install ${runtime_img} images/install.img
mkdir ${BOOTDIR} ${KERNELDIR}
install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
@ -66,7 +66,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso \
${efiargs} -R -J -V '${product.name}' -T -graft-points \
${BOOTDIR}=${outroot}/${BOOTDIR} \
${KERNELDIR}=${outroot}/${KERNELDIR} \
${runtime_img}=${outroot}/${runtime_img} \
LiveOS/squashfs.img=${outroot}/images/install.img \
${efigraft}
runcmd isohybrid ${outroot}/images/boot.iso
treeinfo images-${basearch} boot.iso images/boot.iso

View File

@ -219,8 +219,7 @@ class Lorax(BaseLoraxClass):
rb.cleanup()
logger.info("creating the runtime image")
# NOTE: dracut dmsquash-live-root requires image named "*squashfs.img"
runtime = "images/anaconda-squashfs.img"
runtime = "images/install.img"
# FIXME: compression options (type, speed, etc.)
rb.create_runtime(joinpaths(installroot,runtime))