summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2009-09-22 13:00:38 -1000
committerDavid Cantrell <dcantrell@redhat.com>2009-09-22 13:03:25 -1000
commit7b6dcafcdd435ceb0d417643461748898b387cc0 (patch)
treefd555807ca7716be6bc2040a67c88efeb1e3208e /scripts
parent013ddea862a75ed5841981b8c92dd85c5d0cb0ae (diff)
downloadanaconda-7b6dcafcdd435ceb0d417643461748898b387cc0.tar.gz
anaconda-7b6dcafcdd435ceb0d417643461748898b387cc0.tar.xz
anaconda-7b6dcafcdd435ceb0d417643461748898b387cc0.zip
Preserve whitespace in $CDLABEL in mk-images.x86
Wrap $CDLABEL in single quotes and use eval to preserve whitespace in $CDLABEL when running $mkisocmd. Patch from Dennis Gregorovic <dgregor@redhat.com>.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mk-images.x866
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index f62a80d98..6a8c53786 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -171,10 +171,10 @@ 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 '$CDLABEL' -T -graft-points isolinux=$TOPDESTPATH/isolinux images=$TOPDESTPATH/images $EFIGRAFT"
echo $PWD:\$ $mkisocmd
- $mkisocmd
- if [ -x /usr/bin/isohybrid ]; then
+ eval $mkisocmd
+ if [ -x /usr/bin/isohybrid ]; then
isohybrid $TOPDESTPATH/images/$BOOTISO || echo "Unable to make hybrid boot.iso"
fi
fi