From 48b3af25454df57fe5c3f2b39cd10106e1b9c8fd Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont.jones@canonical.com>
Date: Fri, 21 Jan 2005 04:11:49 +0000
Subject: [PATCH] actually run locale-gen, pre-fill (zero) the fsimg files

---
 debian/changelog | 7 +++++++
 livecd.sh        | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55d82bf3..16fab1e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (0.10) hoary; urgency=low
+
+  * Actually run /usr/sbin/locale-gen to generate the locales.
+  * Try zero-filling the fsimage file
+
+ -- LaMont Jones <lamont@debian.org>  Thu, 20 Jan 2005 19:14:45 -0700
+
 livecd-rootfs (0.9) hoary; urgency=low
 
   * Can't divert conffiles, nor do we need to anymore.
diff --git a/livecd.sh b/livecd.sh
index 38c91b8f..2a20f30e 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -123,6 +123,7 @@ chroot $ROOT apt-get update
 chroot $ROOT apt-get -y install ubuntu-base ubuntu-desktop $OTHER </dev/null
 chroot $ROOT /etc/cron.daily/slocate
 chroot $ROOT /etc/cron.daily/man-db
+chroot $ROOT /usr/sbin/locale-gen
 
 # remove our diversions
 for file in $DIVERTS; do
@@ -162,16 +163,16 @@ MOUNTS="$MOUNTS $(pwd)/livecd.mnt"
 DEV=$(losetup -f);
 
 # Make the filesystem, with some room for meta data and such
-SZ=$(python -c "print int($(du -sk $ROOT|sed 's/[^0-9].*$//')*1.1+$USZ)")
-(( SZ > 2097150 )) && SZ=2097150
-SZ=2097150				# XXX fix size for now
+SZ=$(python -c "print int(($(du -sk $ROOT|sed 's/[^0-9].*$//')*1.1+$USZ)/1024)")
+(( SZ > 2047 )) && SZ=2047
+SZ=2047				# XXX fix size for now
 
 for fsbs in 1024:65536; do 
   FSBLOCK=${fsbs%:*}
   COMP=${fsbs#*:}
   IMGNAME=${IMG}-${FSBLOCK}
   if [ ! -f ${IMGNAME} ]; then
-    dd if=/dev/zero of=$IMGNAME seek=$SZ bs=1024 count=1
+    dd if=/dev/zero of=$IMGNAME count=$SZ bs=1M
     INUM=""
     [ -n "$UINUM" ] && INUM="-N "$(python -c "print $(find ${ROOT}|wc -l)+$UINUM") || INUM=""
     mke2fs -b $FSBLOCK $INUM -Osparse_super -F $IMGNAME