HACKING | 4 ++--
Makefile | 2 +-
imgcreate/fs.py | 3 ++-
tools/livecd-iso-to-disk.sh | 4 +++-
4 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 2d81ac6cdbe20e785f38a74e1f5991b2f4c0d063
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Dec 22 14:26:21 2010 -0800
Version 5.2
diff --git a/Makefile b/Makefile
index 2fd0549..5a8a9ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 15.1
+VERSION = 15.2
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit 817682c10ab42fcef0da96ebfce5b8a9bdba7eda
Author: David Lehman <dlehman(a)redhat.com>
Date: Fri Dec 17 10:21:02 2010 -0600
Assign a device-mapper UUID w/ subsystem prefix to the dm snapshot.
Creators of device-mapper maps/devices should set a device-mapper
UUID for their devices which include a prefix to identify the
subsystem responsible for the device. The format generally used is
$SUBSYSTEM-$MAPNAME, with subsystem being all caps.
diff --git a/imgcreate/fs.py b/imgcreate/fs.py
index f0e0885..a43c6e5 100644
--- a/imgcreate/fs.py
+++ b/imgcreate/fs.py
@@ -527,7 +527,8 @@ class DeviceMapperSnapshot(object):
self.imgloop.device,
self.cowloop.device)
- args = ["/sbin/dmsetup", "create", self.__name,
"--table", table]
+ args = ["/sbin/dmsetup", "create", self.__name,
+ "--uuid", "LIVECD-%s" % self.__name,
"--table", table]
if call(args) != 0:
self.cowloop.cleanup()
self.imgloop.cleanup()
commit 9342cc0249080ca19945cfd0f453ff7c9ead3d99
Author: David Lehman <dlehman(a)redhat.com>
Date: Fri Dec 17 10:21:01 2010 -0600
Fix git URLs to match reality.
diff --git a/HACKING b/HACKING
index 0e88c32..e912112 100644
--- a/HACKING
+++ b/HACKING
@@ -4,11 +4,11 @@ SOURCE CONTROL MANAGEMENT
This project is stored in git and can be checked out using
- git clone
git://git.fedoraproject.org/git/hosted/livecd
+ git clone
git://git.fedorahosted.org/git/livecd
or if you have write access you might want to use
- git clone
ssh://git.fedoraproject.org/git/hosted/livecd
+ git clone
ssh://git.fedorahosted.org/git/livecd
Change history etc. can be obtained from the web interface
commit 8049edc786a6ff347281ea9587c721bc2fb35e31
Author: Frederick Grose <fgrose(a)localhost.localdomain>
Date: Wed Dec 22 13:59:06 2010 -0800
Trap copyFile errors (#663849)
'Set -o pipefail' is needed with the new starce-based copy function.
Also, keep || clauses inprocess, so that an exit command applies to
the main script and not just a subshell.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 51abc0c..dfabed7 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -688,13 +688,15 @@ fi
[ -n "$efi" -a ! -d $USBMNT/EFI/boot ] && mkdir -p $USBMNT/EFI/boot
# Live image copy
+set -o pipefail
if [ "$isotype" = "live" -a -z "$skipcopy" ]; then
echo "Copying live image to USB stick"
[ ! -d $USBMNT/$LIVEOS ] && mkdir $USBMNT/$LIVEOS
[ -n "$keephome" -a -f "$USBMNT/$HOMEFILE" ] && mv
$USBMNT/$HOMEFILE $USBMNT/$LIVEOS/$HOMEFILE
if [ -n "$skipcompress" -a -f $CDMNT/LiveOS/squashfs.img ]; then
mount -o loop $CDMNT/LiveOS/squashfs.img $CDMNT || exitclean
- copyFile $CDMNT/LiveOS/ext3fs.img $USBMNT/$LIVEOS/ext3fs.img || (umount $CDMNT ;
exitclean)
+ copyFile $CDMNT/LiveOS/ext3fs.img $USBMNT/$LIVEOS/ext3fs.img || {
+ umount $CDMNT ; exitclean ; }
umount $CDMNT
elif [ -f $CDMNT/LiveOS/squashfs.img ]; then
copyFile $CDMNT/LiveOS/squashfs.img $USBMNT/$LIVEOS/squashfs.img || exitclean