From df6947ec2bc024ead29c48915311a4ccca42d3d0 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 10 Jun 2010 07:38:05 +0200
Subject: [PATCH] Import patches-unapplied version 1.118 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: fa9ee47266f9effac0d6efe0573421140adf37e4

New changelog entries:
  * add temporary workaround for genext2fs bug 583317 (wrong filesystem
    revision for ext3 filesystems)
---
 .bzrignore       | 4 ----
 debian/changelog | 7 +++++++
 livecd.sh        | 2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 .bzrignore

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 0c673e57..00000000
--- a/.bzrignore
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/*.debhelper*
-debian/*.substvars
-debian/files
-debian/livecd-rootfs
diff --git a/debian/changelog b/debian/changelog
index 9401c4f6..1716763c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.118) maverick; urgency=low
+
+  * add temporary workaround for genext2fs bug 583317 (wrong filesystem
+    revision for ext3 filesystems)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 10 Jun 2010 07:38:05 +0200
+
 livecd-rootfs (1.117) maverick; urgency=low
 
   * Only use tmpfs on amd64, due to space restrictions on the current
diff --git a/livecd.sh b/livecd.sh
index 127387ec..fb8699fc 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -679,6 +679,8 @@ Pin-Priority: 550
     if [ "$IMAGEFORMAT" = "ext3" ]; then
         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
     fi
 
     # LTSP chroot building (only in 32bit and for Edubuntu (DVD))