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

[Jeremy Katz]

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

New commits:
commit d2de65a9ee73af0d001660ee8b2939d88f4f83fe
Author: Martin Dengler <martin at martindengler.com>
Date:   Tue Jun 23 21:59:16 2009 +0100

    don't need to checkMBR() for loop devices
    
    livecd-iso-to-disk.sh doesn't do the right thing w.r.t. loop devices
    and MBR detection.  I don't think this is intentional, but it
    currently requires loop devices to start with an MBR, by virtue of
    getdisk() being a NOOP for loop devices and checkMBR assuming that the
    disk must need an MBR.  checkMBR() should just ignore loop devices
    like other key functions do.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 672e6db..0efef58 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -93,6 +93,9 @@ resetMBR() {
 }
 
 checkMBR() {
+    if [[ "$DEV" =~ "/dev/loop*" ]]; then
+       return 0
+    fi
     getdisk $1
 
     bs=$(mktemp /tmp/bs.XXXXXX)