[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH 2/2] Revert "Set stage2= on x86 boot.iso"



Ack.

On Tue, 27 Jul 2010, Chris Lumens wrote:

This reverts commit ceb63411285e06652080fd39fe0317d1c19c295a.  Having stage2=
always present means the beginning of STEP_METHOD will short cut out
regardless of the state of our 47 other flag variables, which is not helpful
behavior.

Related: rhbz#611154
---
scripts/mk-images.x86 |    6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index 890b760..8b32524 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -18,7 +18,6 @@
#

SYSLINUX=$IMGPATH/usr/share/syslinux/syslinux-nomtools
-CDLABEL=$PRODUCT

if [ ! -f $SYSLINUX ]; then
  echo "Warning: nomtools syslinux doesn't exist"
@@ -95,9 +94,6 @@ 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
@@ -143,7 +139,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 '$CDLABEL' -T -graft-points isolinux=$TOPDESTPATH/isolinux images=$TOPDESTPATH/images $EFIGRAFT"
+        mkisocmd="mkisofs -v -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images=$TOPDESTPATH/images $EFIGRAFT"
        echo $PWD:\$ $mkisocmd
        eval $mkisocmd
        if [ -x /usr/bin/isohybrid ]; then


--
David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]