Import patches-unapplied version 1.125 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: ea4dcbc59f

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

@@ -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 <ogra@ubuntu.com>  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

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))