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

[Brian C. Lane]

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

New commits:
commit a162dd4c0e8745ea37185742e9cd2e86565e1227
Author: Brian C. Lane <bcl at redhat.com>
Date:   Mon Aug 8 15:27:24 2011 -0700

    Make MBR replacement message more clear

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 077e74f..46e4abb 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -366,8 +366,7 @@ checkMBR() {
     rm -f $bs
     if [ "$mbrword" = "0000" ]; then
         echo "MBR appears to be blank."
-        echo "Do you want to replace the MBR on this device?"
-        echo "Press Enter to continue or ctrl-c to abort"
+        echo "Press Enter to replace the MBR and continue or ctrl-c to abort"
         read
         resetMBR $1
     fi


commit 8e3e899aafcea71f9ba4452a33cd5dbae945abff
Author: Brian C. Lane <bcl at redhat.com>
Date:   Mon Aug 8 15:18:06 2011 -0700

    Ensure previous filesystems are wiped when formatting (#712553)
    
    Add wipefs step before partitioning the device. This will remove any
    previous filesystem signatures as well as iso9660's signature which
    has been known to cause problems.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index d5c3f65..077e74f 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -418,6 +418,7 @@ createGPTLayout() {
     echo "Press Enter to continue or ctrl-c to abort"
     read
     umount ${device}* &> /dev/null || :
+    wipefs -a ${device}
     /sbin/parted --script $device mklabel gpt
     partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
     size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//')
@@ -441,6 +442,7 @@ createMSDOSLayout() {
     echo "Press Enter to continue or ctrl-c to abort"
     read
     umount ${device}* &> /dev/null || :
+    wipefs -a ${device}
     /sbin/parted --script $device mklabel msdos
     partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
     size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//')
@@ -468,6 +470,7 @@ createEXTFSLayout() {
     echo "Press Enter to continue or ctrl-c to abort"
     read
     umount ${device}* &> /dev/null || :
+    wipefs -a ${device}
     /sbin/parted --script $device mklabel msdos
     partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
     size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//')