[Fedora-livecd-list] Branch 'f15-branch' - 6 commits - imgcreate/live.py Makefile tools/livecd-iso-to-disk.sh

Makefile | 2 +- imgcreate/live.py | 3 +++ tools/livecd-iso-to-disk.sh | 11 ++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) New commits: commit 1c06844e36d239fbc0a0ebf25c7ecf04d7d79023 Author: Brian C. Lane <bcl(a)redhat.com&gt; Date: Tue Aug 30 11:19:08 2011 -0700 Version 15.8 diff --git a/Makefile b/Makefile index 9832301..83d9127 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 15.7 +VERSION = 15.8 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit e740901b9e42459d036de762a73845395d610e05 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 0966e3a..6b71a09 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -413,6 +413,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$//') @@ -436,6 +437,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$//') @@ -463,6 +465,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 4af6fd368c548c9ae3ee9197c4fe337d1ca5bf58 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 ddd1863..0966e3a 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1005,7 +1005,7 @@ if [ \( "$srctype" = "installer" -o "$srctype" = "netinst" \) ]; then copyFile $SRCMNT/images/install.img $TGTMNT/images/install.img || exitclean fi if [ "$srctype" = "installer" -a -z "$skipcopy" ]; then - cp $SRC $TGTMNT/ + copyFile $SRC $TGTMNT/ fi sync fi commit 7d028b28877f07b555ddbd3fce4b300659a4c594 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 8adade6..ddd1863 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -622,6 +622,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 7c99195abd98c69fd53a5f21cc35880baa64175d Author: Brian C. Lane <bcl(a)redhat.com&gt; 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 b7cee72..8adade6 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -334,6 +334,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 d1373cc1a7d14de319b8e7097539c25f1d2a921c 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 10d5cec..e640c67 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -896,5 +896,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!")