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

x86,ppc: add "root=live:CDLABEL=..." boot arg to CD images

Browse Source 
The current implementation is hacky and gross; we should at least update
the bootloader files in anaconda to have a %ROOT% param in them.
This commit is contained in:
Will Woods 2011-06-27 19:22:33 -04:00
parent 25ef6b604d
commit d1266ff4e9
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/ppc.tmpl
View File

@ -42,12 +42,16 @@ install ofboot.b ${MACDIR}
mkdir ${KERNELDIR} mkdir ${KERNELDIR}
install ${ANABOOTDIR}/yaboot.conf.in ${KERNELDIR}/yaboot.conf install ${ANABOOTDIR}/yaboot.conf.in ${KERNELDIR}/yaboot.conf
installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz
## Note: this used to be ramdisk.img.gz
installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
## FIXME: anaconda has the initrd name hard-coded as "ramdisk.img.gz"
replace ramdisk.image.gz initrd.img ${KERNELDIR}/yaboot.conf
replace %PRODUCT% ${product.name} ${KERNELDIR}/yaboot.conf replace %PRODUCT% ${product.name} ${KERNELDIR}/yaboot.conf
replace %VERSION% ${product.version} ${KERNELDIR}/yaboot.conf replace %VERSION% ${product.version} ${KERNELDIR}/yaboot.conf
replace %BITS% ${bits} ${KERNELDIR}/yaboot.conf replace %BITS% ${bits} ${KERNELDIR}/yaboot.conf
## FIXME: root=%ROOT% should really be in the config somewhere
replace "read-only" "read-only\n\tappend=\"root=live:CDLABEL=PBOOT\""
## Weirdo wrapper junk that makes the netboot combined ppc{32,64}.img ## Weirdo wrapper junk that makes the netboot combined ppc{32,64}.img
%if exists(MKZIMAGE) and exists(ZSTUB): %if exists(MKZIMAGE) and exists(ZSTUB):
@ -75,9 +79,13 @@ runcmd usr/lib/yaboot/addnote ${outroot}/${BOOTDIR}/chrp/yaboot
%if len(bitsizes) == 2: %if len(bitsizes) == 2:
## magic ppc biarch tree! we need magic ppc biarch config. ## magic ppc biarch tree! we need magic ppc biarch config.
install ${ANABOOTDIR}/yaboot.conf.3264 etc/yaboot.conf install ${ANABOOTDIR}/yaboot.conf.3264 etc/yaboot.conf
## FIXME: hardcoded image name (see above)
replace ramdisk.image.gz initrd.img etc/yaboot.conf
replace %PRODUCT% ${product.name} etc/yaboot.conf replace %PRODUCT% ${product.name} etc/yaboot.conf
replace %VERSION% ${product.version} etc/yaboot.conf replace %VERSION% ${product.version} etc/yaboot.conf
replace %BITS% 32 etc/yaboot.conf replace %BITS% 32 etc/yaboot.conf
## FIXME: see above about root=%ROOT%
replace "read-only" "read-only\n\tappend=\"root=live:CDLABEL=PBOOT\""
%else: %else:
copy ${KERNELDIR}/yaboot.conf etc/yaboot.conf copy ${KERNELDIR}/yaboot.conf etc/yaboot.conf
%endif %endif

5
share/x86.tmpl
View File

@ -60,6 +60,11 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
<%include file="efi.tmpl" args="ANABOOTDIR=ANABOOTDIR, KERNELDIR=KERNELDIR, efiarch=efiarch"/> <%include file="efi.tmpl" args="ANABOOTDIR=ANABOOTDIR, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
%endif %endif
## CDLABEL matches the -V argument to mkisofs
replace "append initrd=initrd.img" \
"append initrd=initrd.img root=live:CDLABEL='${product.name}'" \
${BOOTDIR}/isolinux.cfg
runcmd mkisofs -o ${outroot}/images/boot.iso \ runcmd mkisofs -o ${outroot}/images/boot.iso \
-b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \ -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \
-boot-load-size 4 -boot-info-table -no-emul-boot \ -boot-load-size 4 -boot-info-table -no-emul-boot \