Import patches-unapplied version 1.143 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 54bcd26b87

New changelog entries:
  * add more spare space to the ext2 filesystem images to compensate journal
    overhead and make it possible to run oem-config even without resizing
  * do not reserve 5% for root in the ext2 image files.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (1.143) maverick; urgency=low
+
+  * add more spare space to the ext2 filesystem images to compensate journal
+    overhead and make it possible to run oem-config even without resizing
+  * do not reserve 5% for root in the ext2 image files.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 26 Jul 2010 14:26:08 +0200
+
 livecd-rootfs (1.142) maverick; urgency=low
 
   * do not fail if losetup -d does not find a device

livecd.sh

@@ -76,8 +76,8 @@ livefs_squash()
 
 livefs_ext2()
 {
-  # Add 10MiB extra free space for first boot + ext3 journal
-  size=$(($(du -ks ${ROOT} | cut -f1) + (10240)))
+  # Add 500MiB extra free space for first boot + ext3 journal
+  size=$(($(du -ks ${ROOT} | cut -f1) + (512000)))
   # DEBUG: get the detected size in the log
   echo "size variable set to: ${size}"
   MOUNTPOINT=$(mktemp -d)
@@ -89,7 +89,7 @@ livefs_ext2()
 
   # create an empty ext2 image and loop mount it
   dd if=/dev/zero of=livecd.${FSS}.ext2 bs=1024 count=0 seek=$size
-  mke2fs -F livecd.${FSS}.ext2
+  mke2fs -m 0 -F livecd.${FSS}.ext2
   # DEBUG: see if the image size matches the detected size value
   ls -l livecd.${FSS}.ext2
   mount -o loop=${DEV} livecd.${FSS}.ext2 ${MOUNTPOINT}