[PATCH] Handle the case when the kernel can't mount squashfs.img (probably a mksquashfs/running kernel mismatch).
3:33 p.m.
Hi,
The loop mount of the squashfs from rawhide images fails for me on F10,
which makes livecd-iso-to-disk exit without cleaning up (unmounting etc.).
This make iso-to-disk handle the error and also makes it do almost what
the user asked by copying the squashfs as-is. Maybe it should clean up
and exit instead, telling the user to remove --skipcompress or add
--compress after --xo or something like that...
/abo
---
tools/livecd-iso-to-disk.sh | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index f0c7331..4621d45 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -462,9 +462,17 @@ else
fi
livesize=$(du -s -B 1M $check | awk {'print $1;'})
if [ -n "$skipcompress" ]; then
- mount -o loop $CDMNT/LiveOS/squashfs.img $CDMNT
- livesize=$(du -s -B 1M $CDMNT/LiveOS/ext3fs.img | awk {'print $1;'})
- umount $CDMNT
+ if [ -e $CDMNT/LiveOS/squashfs.img ]; then
+ if mount -o loop $CDMNT/LiveOS/squashfs.img $CDMNT; then
+ livesize=$(du -s -B 1M $CDMNT/LiveOS/ext3fs.img | awk {'print $1;'})
+ umount $CDMNT
+ else
+ echo "WARNING: --skipcompress or --xo was specified but the currently"
+ echo "running kernel can not mount the squashfs from the ISO file
to extract"
+ echo "it. The compressed squashfs will be copied to the USB stick."
+ skipcompress=""
+ fi
+ fi
fi
free=$(df -B1M $USBDEV |tail -n 1 |awk {'print $4;'})
@@ -505,7 +513,7 @@ if [ -z "$skipcopy" ];then
[ ! -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
+ mount -o loop $CDMNT/LiveOS/squashfs.img $CDMNT || exitclean
cp $CDMNT/LiveOS/ext3fs.img $USBMNT/$LIVEOS/ext3fs.img ||
(umount $CDMNT ; exitclean)
umount $CDMNT
elif [ -f $CDMNT/LiveOS/squashfs.img ]; then
8:06 p.m.
On Wednesday, March 25 2009, Alexander Bostr?m said:
The loop mount of the squashfs from rawhide images fails for me on
F10,
which makes livecd-iso-to-disk exit without cleaning up (unmounting
etc.).
This make iso-to-disk handle the error and also makes it do almost what
the user asked by copying the squashfs as-is. Maybe it should clean up
and exit instead, telling the user to remove --skipcompress or add
--compress after --xo or something like that...
This looks okay, but thunderbird horribly mangled the patch. Your last
one I was able to fix up manually, but can you please send with a mailer
that doesn't mangle? git send-email can do the trick nicely :)
Jeremy
3:57 p.m.
New subject: [PATCH] Handle the case when the kernel can't mount squashfs.img (probably a mksquashfs/running kernel mismatch).
Jeremy Katz skrev:
This looks okay, but thunderbird horribly mangled the patch. Your
last
one I was able to fix up manually, but can you please send with a mailer
that doesn't mangle? git send-email can do the trick nicely :)
How annoying! But I'll send it again.
/abo
4 p.m.
---
tools/livecd-iso-to-disk.sh | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 8702936..682c851 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -191,6 +191,11 @@ checkGPT() {
partinfo=$(/sbin/parted --script -m $device "print" |grep ^$partnum:)
volname=$(echo $partinfo |cut -d : -f 6)
flags=$(echo $partinfo |cut -d : -f 7)
+ if [ "$volname" != "EFI System Partition" ]; then
+ echo "Partition name must be 'EFI System Partition'"
+ echo "This can be set in parted or you can run with --reset-mbr"
+ exitclean
+ fi
if [ "$(echo $flags |grep -c boot)" = "0" ]; then
echo "Partition isn't marked bootable!"
echo "You can mark the partition as bootable with "
@@ -457,9 +462,17 @@ else
fi
livesize=$(du -s -B 1M $check | awk {'print $1;'})
if [ -n "$skipcompress" ]; then
- mount -o loop $CDMNT/LiveOS/squashfs.img $CDMNT
- livesize=$(du -s -B 1M $CDMNT/LiveOS/ext3fs.img | awk {'print $1;'})
- umount $CDMNT
+ if [ -e $CDMNT/LiveOS/squashfs.img ]; then
+ if mount -o loop $CDMNT/LiveOS/squashfs.img $CDMNT; then
+ livesize=$(du -s -B 1M $CDMNT/LiveOS/ext3fs.img | awk {'print $1;'})
+ umount $CDMNT
+ else
+ echo "WARNING: --skipcompress or --xo was specified but the currently"
+ echo "running kernel can not mount the squashfs from the ISO file to
extract"
+ echo "it. The compressed squashfs will be copied to the USB stick."
+ skipcompress=""
+ fi
+ fi
fi
free=$(df -B1M $USBDEV |tail -n 1 |awk {'print $4;'})
@@ -500,7 +513,7 @@ if [ -z "$skipcopy" ];then
[ ! -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
+ mount -o loop $CDMNT/LiveOS/squashfs.img $CDMNT || exitclean
cp $CDMNT/LiveOS/ext3fs.img $USBMNT/$LIVEOS/ext3fs.img || (umount $CDMNT ;
exitclean)
umount $CDMNT
elif [ -f $CDMNT/LiveOS/squashfs.img ]; then
--
1.6.0.6
10:42 a.m.
On Friday, March 27 2009, Alexander Bostr?m said:
Jeremy Katz skrev:
> This looks okay, but thunderbird horribly mangled the patch. Your last
> one I was able to fix up manually, but can you please send with a mailer
> that doesn't mangle? git send-email can do the trick nicely :)
How annoying! But I'll send it again.
Thanks, applied
Jeremy
5499
days inactive
5504
days old
livecd@lists.fedoraproject.org
4 comments
2 participants
participants (2)
-
Alexander Boström -
Jeremy Katz