From a6f4c89843e6b1bffa0e765bdc8894c3e24afbf6 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 28 Jun 2010 16:27:51 +0200 Subject: [PATCH] Import patches-unapplied version 1.125 to ubuntu/maverick Imported using git-ubuntu import. Changelog parent: ea4dcbc59f7218637892c7c0b619357119a34b80 New changelog entries: * make livecd.sh not fail if e2fsck returns non-zero (which is always the case with genext2fs images due to bug 583317) --- debian/changelog | 7 +++++++ livecd.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b892d70a..37055746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.125) maverick; urgency=low + + * make livecd.sh not fail if e2fsck returns non-zero (which is always the + case with genext2fs images due to bug 583317) + + -- Oliver Grawert Mon, 28 Jun 2010 16:27:51 +0200 + livecd-rootfs (1.124) maverick; urgency=low * BuildLiveCD: update livecd chroot at start of run, for freshest diff --git a/livecd.sh b/livecd.sh index efc40b9a..5903a482 100755 --- a/livecd.sh +++ b/livecd.sh @@ -687,7 +687,7 @@ Pin-Priority: 550 tune2fs -j livecd.${FSS}.ext2 mv livecd.${FSS}.ext2 livecd.${FSS}.ext3 # temporary workaround for LP: #583317 with ext3 images - e2fsck -fy livecd.${FSS}.ext3 > /dev/null 2>&1 + e2fsck -fy livecd.${FSS}.ext3 || true fi # LTSP chroot building (only in 32bit and for Edubuntu (DVD))