imgcreate/live.py | 1 +
tools/livecd-iso-to-disk.sh | 2 ++
2 files changed, 3 insertions(+)
New commits:
commit 59aa5640bf2216d1823ce7d552ae8530d44bdabb
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Tue Aug 25 10:59:42 2009 -0400
Fix traceback when implantisomd5 isn't available (Ron Yorston)
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 528840d..c49b358 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -264,6 +264,7 @@ class LiveImageCreatorBase(LoopImageCreator):
implantisomd5 = "/usr/lib/anaconda-runtime/implantisomd5"
else:
logging.warn("isomd5sum not installed; not setting up mediacheck")
+ return
subprocess.call([implantisomd5, iso])
commit 89720ad085e3996bded0e9570878e56a158232ff
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Aug 20 14:13:41 2009 -0400
Sleep to avoid races (#517477)
Try to sleep a little to avoid racing with system stuff poking at new filesystems
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 0efef58..cd75153 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -28,6 +28,7 @@ usage() {
}
cleanup() {
+ sleep 2
[ -d "$CDMNT" ] && umount $CDMNT && rmdir $CDMNT
[ -d "$USBMNT" ] && umount $USBMNT && rmdir $USBMNT
}
@@ -598,6 +599,7 @@ if [ "$homesizemb" -gt 0 ]; then
done
mke2fs -j /dev/mapper/EncHomeFoo
tune2fs -c0 -i0 -ouser_xattr,acl /dev/mapper/EncHomeFoo
+ sleep 2
cryptsetup luksClose EncHomeFoo
losetup -d $loop
else
Show replies by thread