diff options
| author | Jeremy Katz <katzj@redhat.com> | 2009-07-16 11:22:48 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2009-07-21 19:23:38 -0400 |
| commit | ceb63411285e06652080fd39fe0317d1c19c295a (patch) | |
| tree | 6a009d545130b70b873af0d4ff7fc9d5bc45f55b /scripts/mk-images.x86 | |
| parent | 9756532b6fdd94ba7ab3b85bbc720785f781c52d (diff) | |
| download | anaconda-ceb63411285e06652080fd39fe0317d1c19c295a.tar.gz anaconda-ceb63411285e06652080fd39fe0317d1c19c295a.tar.xz anaconda-ceb63411285e06652080fd39fe0317d1c19c295a.zip | |
Set stage2= on x86 boot.iso
x86 boot.iso is built with isohybrid, so let's pass what the stage2
will be in that case
Diffstat (limited to 'scripts/mk-images.x86')
| -rw-r--r-- | scripts/mk-images.x86 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index add8cffe1..2d94e06aa 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -18,6 +18,7 @@ # SYSLINUX=$IMGPATH/usr/share/syslinux/syslinux-nomtools +CDLABEL=$PRODUCT if [ ! -f $SYSLINUX ]; then echo "Warning: nomtools syslinux doesn't exist" @@ -114,6 +115,9 @@ makeBootImages() { # isolinux needs the config file to be isolinux.cfg mv $MBD_BOOTTREE/syslinux.cfg $MBD_BOOTTREE/isolinux.cfg + # set up the label for finding stage2 with a hybrid iso + sed -i 's/initrd=initrd.img/initrd=initrd.img stage2=hd:LABEL=$CDLABEL/' $MBD_BOOTTREE/isolinux.cfg + # copy in memtest if present if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* ]; then cp $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* $MBD_BOOTTREE/memtest @@ -167,7 +171,7 @@ doPostImages() { echo "No efiboot.img found, making BIOS-only boot.iso" fi BIOSARGS="-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" - mkisocmd="mkisofs -v -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images=$TOPDESTPATH/images $EFIGRAFT" + mkisocmd="mkisofs -v -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$CDLABEL" -T -graft-points isolinux=$TOPDESTPATH/isolinux images=$TOPDESTPATH/images $EFIGRAFT" echo $PWD:\$ $mkisocmd $mkisocmd if [ -x /usr/bin/isohybrid ]; then |