From 1d8f1dc9d6e068d86d68b96aaa403c95dd52bb64 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Sat, 31 Jul 2010 16:29:40 +0200
Subject: [PATCH] Import patches-unapplied version 1.145 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 7a2e73fd222e1ce14684176399bd85e3e2918a8a

New changelog entries:
  * raise inode count during ext2fs build to be able to use the full size of
    the ext2 image
  * drop debugging code
---
 debian/changelog |  8 ++++++++
 livecd.sh        | 11 ++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afe44d76..b6182450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (1.145) maverick; urgency=low
+
+  * raise inode count during ext2fs build to be able to use the full size of
+    the ext2 image
+  * drop debugging code
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Sat, 31 Jul 2010 16:29:40 +0200
+
 livecd-rootfs (1.144) maverick; urgency=low
 
   * cat /proc/mounts before trying to copy to the ext2 image, there still
diff --git a/livecd.sh b/livecd.sh
index d231470b..e12aeefc 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -78,8 +78,6 @@ livefs_ext2()
 {
   # 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)
   DEV=$(losetup -f)
   echo "Building ext2 filesystem."
@@ -89,16 +87,11 @@ 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 -m 0 -F livecd.${FSS}.ext2
-  # DEBUG: see if the image size matches the detected size value
-  ls -l livecd.${FSS}.ext2
+  mke2fs -i 8192 -F livecd.${FSS}.ext2
   mount -o loop=${DEV} livecd.${FSS}.ext2 ${MOUNTPOINT}
 
-  # DEBUG: see if the imounted image free space matches
-  df
-  cat /proc/mounts
   # copy chroot content to image
-  cp -a ${ROOT} ${MOUNTPOINT}
+  cp -a ${ROOT}/* ${MOUNTPOINT}
 
   # clean up
   umount ${MOUNTPOINT}