almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Move images/install.img to LiveOS/squashfs.img (#732298)

Browse Source 
Since pungi doesn't know that images/install.img needs to be moved to
LiveOS/squashfs.img for images to be "live", they aren't bootable.

This is the simple solution to the problem. Thanks to Karsten Hopp
for the original patch.
This commit is contained in:
Will Woods 2011-10-11 14:58:30 -04:00
parent b59172a519
commit 9df3348a71
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/ppc.tmpl
View File

@ -2,6 +2,7 @@
<% <%
configdir="tmp/config_files" configdir="tmp/config_files"
BOOTDIR="ppc" BOOTDIR="ppc"
LIVEDIR="LiveOS"
MACDIR=BOOTDIR+"/mac" MACDIR=BOOTDIR+"/mac"
NETBOOTDIR="images/netboot" NETBOOTDIR="images/netboot"
@ -12,8 +13,8 @@ bitsizes = set()
prepboot = "" prepboot = ""
%> %>
mkdir images mkdir ${LIVEDIR}
install ${runtime_img} images/install.img install ${runtime_img} ${LIVEDIR}/squashfs.img
## basic ppc stuff ## basic ppc stuff
mkdir ${BOOTDIR} mkdir ${BOOTDIR}
@ -82,7 +83,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \
etc=${outroot}/etc \ etc=${outroot}/etc \
${BOOTDIR}=${outroot}/${BOOTDIR} \ ${BOOTDIR}=${outroot}/${BOOTDIR} \
${NETBOOTDIR}=${outroot}/${NETBOOTDIR} \ ${NETBOOTDIR}=${outroot}/${NETBOOTDIR} \
LiveOS/squashfs.img=${outroot}/images/install.img ${LIVEDIR}=${outroot}/${LIVEDIR}
%if len(bitsizes) == 2: %if len(bitsizes) == 2:
treeinfo images-ppc boot.iso images/boot.iso treeinfo images-ppc boot.iso images/boot.iso

9
share/sparc.tmpl
View File

@ -2,10 +2,11 @@
<% <%
configdir="tmp/config_files" configdir="tmp/config_files"
BOOTDIR="boot" BOOTDIR="boot"
LIVEDIR="LiveOS"
%> %>
mkdir images mkdir ${LIVEDIR}
install ${runtime_img} images/install.img install ${runtime_img} ${LIVEDIR}/squashfs.img
install boot/*.b ${BOOTDIR} install boot/*.b ${BOOTDIR}
install ${configdir}/silo.conf ${BOOTDIR} install ${configdir}/silo.conf ${BOOTDIR}
@ -27,6 +28,6 @@ runcmd mkisofs -R -J -T -G /${BOOTDIR}/isofs.b -B ... \
-x Fedora -x repodata \ -x Fedora -x repodata \
-sparc-label "${product.name} ${product.version} Boot Disc" \ -sparc-label "${product.name} ${product.version} Boot Disc" \
-o ${outroot}/images/boot.iso \ -o ${outroot}/images/boot.iso \
-graft-points boot=${outroot}/${BOOTDIR} \ -graft-points ${BOOTDIR}=${outroot}/${BOOTDIR} \
LiveOS/squashfs.img=${outroot}/images/install.img ${LIVEDIR}=${outroot}/${LIVEDIR}
treeinfo images-${basearch} boot.iso images/boot.iso treeinfo images-${basearch} boot.iso images/boot.iso

7
share/x86.tmpl
View File

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