Branch 'f14-branch' - 5 commits - imgcreate/live.py Makefile tools/livecd-iso-to-disk.sh

[Brian C. Lane]

 Makefile                    |    2 +-
 imgcreate/live.py           |    3 +++
 tools/livecd-iso-to-disk.sh |    9 ++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit b4f016f4c7d6b687806ce014cd10fcdfc255b7e7
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Tue Aug 30 10:53:34 2011 -0700

    Version 14.3

diff --git a/Makefile b/Makefile
index de4dd5e..e6f67eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 14.2
+VERSION = 14.3
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}


commit 038cb52daadd2f69f1a00aaa7e0f7e1bce0a4a74
Author: Brian C. Lane <bcl(a)redhat.com&gt;
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 111dec3..16302c1 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -171,6 +171,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$//')
@@ -194,6 +195,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$//')
@@ -221,6 +223,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$//')


commit 45c9b1ae299688eaf00944258f4e38e5fc2a87ed
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Tue Aug 23 17:17:21 2011 -0700

    Use copyFile on the iso

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 37e73ba..111dec3 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -729,7 +729,7 @@ if [ \( "$isotype" = "installer" -o
"$isotype" = "netinst" \) ]; then
         copyFile $CDMNT/images/install.img $USBMNT/images/install.img || exitclean
     fi
     if [ "$isotype" = "installer" -a -z "$skipcopy" ];
then
-        cp $ISO $USBMNT/
+        copyFile $ISO $USBMNT/
     fi
     sync
 fi


commit 8605046b9a0590e3a111c52d404217b158c601ae
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Tue Aug 23 15:01:59 2011 -0700

    Use rsync to copy if available

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index fe49fd4..37e73ba 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -379,6 +379,10 @@ cp_p() {
 }
 
 copyFile() {
+    if [ -x /usr/bin/rsync ]; then
+        rsync -P "$1" "$2"
+        return
+    fi
 	if [ -x /usr/bin/gvfs-copy ]; then
 	    gvfs-copy -p "$1" "$2"
 	    return


commit ee93fcaee008a22d5a09ca50952e8a982da77bdd
Author: Martin Langhoff <martin.langhoff(a)gmail.com&gt;
Date:   Tue Jul 19 23:59:59 2011 -0400

    Add initial support for ARM architectures
    
    This allows us to get basic ARM builds going. It doesn't take care of
    booting facilities, but those vary widely in the ARM world.
    
    For the time being, setup for booting should be done in %post .

diff --git a/imgcreate/live.py b/imgcreate/live.py
index 0905dcc..dbc5f9a 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -885,5 +885,8 @@ elif arch in ("ppc",):
     LiveImageCreator = ppcLiveImageCreator
 elif arch in ("ppc64",):
     LiveImageCreator = ppc64LiveImageCreator
+elif arch.startswith('arm'):
+    LiveImageCreator = LiveImageCreatorBase
+
 else:
     raise CreatorError("Architecture not supported!")