Branch 'f15-branch' - tools/livecd-iso-to-disk.sh

[Brian C. Lane]

tools/livecd-iso-to-disk.sh |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 46fa124651ebd8654cc1dd1fbfecdc09d4174cc7
Author: Brian C. Lane 
Date:   Thu Feb 24 15:44:46 2011 -0800

gptmbr can be written directly to the mbr

With the change to syslinux 4 in F14 the gptmbr.bin no longer needs the
    GUID of the partition to boot, it just needs the boot flag set on it.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 532022c..b7cee72 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -327,15 +327,13 @@ resetMBR() {
     # if efi, we need to use the hybrid MBR
     if [ -n "$efi" ]; then
         if [ -f /usr/lib/syslinux/gptmbr.bin ]; then
-            gptmbr='/usr/lib/syslinux/gptmbr.bin'
+            cat /usr/lib/syslinux/gptmbr.bin > $device
         elif [ -f /usr/share/syslinux/gptmbr.bin ]; then
-            gptmbr='/usr/share/syslinux/gptmbr.bin'
+            cat /usr/share/syslinux/gptmbr.bin > $device
         else
             echo "Could not find gptmbr.bin (syslinux)"
             exitclean
         fi
-        # our magic number is LBA-2, offset 16 - (512+512+16)/$bs
-        dd if=$device bs=16 skip=65 count=1 | cat $gptmbr - > $device
     else
         if [ -f /usr/lib/syslinux/mbr.bin ]; then
             cat /usr/lib/syslinux/mbr.bin > $device