[Fedora-livecd-list] 2 commits - tools/livecd-iso-to-disk.sh

[Brian C. Lane]

 tools/livecd-iso-to-disk.sh |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a624a4668ca950126d6503d561d7e9cefdabf485
Author: Brian C. Lane <bcl at redhat.com>
Date:   Mon Aug 8 16:21:09 2011 -0700

    Turn on the legacy_boot flag for EFI (#680563)
    
    This allows gptmbr to be able to boot on both EFI and BIOS.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index ff326a5..209f858 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -341,6 +341,8 @@ resetMBR() {
             echo "Could not find gptmbr.bin (syslinux)"
             exitclean
         fi
+        # Make it bootable on EFI and BIOS
+        parted -s $device set $partnum legacy_boot on
     else
         if [ -f /usr/lib/syslinux/mbr.bin ]; then
             cat /usr/lib/syslinux/mbr.bin > $device


commit 1b9e30c0bc295b4f61b07e739a5bb9851546fb71
Author: Brian C. Lane <bcl at redhat.com>
Date:   Mon Aug 8 16:20:20 2011 -0700

    Don't ask about replacing MBR when formatting

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 46e4abb..ff326a5 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -365,9 +365,11 @@ checkMBR() {
     mbrword=$(hexdump -n 2 $bs |head -n 1|awk {'print $2;'})
     rm -f $bs
     if [ "$mbrword" = "0000" ]; then
-        echo "MBR appears to be blank."
-        echo "Press Enter to replace the MBR and continue or ctrl-c to abort"
-        read
+        if [ -z "$format" ]; then
+            echo "MBR appears to be blank."
+            echo "Press Enter to replace the MBR and continue or ctrl-c to abort"
+            read
+        fi
         resetMBR $1
     fi