From a9defe1a47a0ed8e3466b20066fa737eb74921bc Mon Sep 17 00:00:00 2001
From: Michael Casadevall <mcasadevall@ubuntu.com>
Date: Mon, 17 May 2010 14:31:13 -0400
Subject: [PATCH] fixed spacing in the livefs build code

---
 debian/changelog |  3 ++-
 livecd.sh        | 39 +++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06bdd57e..256a2a75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ livecd-rootfs (1.116) UNRELEASED; urgency=low
 
   * added new -f switch for changing image build type
   * added support for building ext2 and ext3 images in addition to squashfs
+  * fixed spacing in the livefs build code
 
- -- Michael Casadevall <mcasadevall@ubuntu.com>  Mon, 17 May 2010 12:47:16 -0400
+ -- Michael Casadevall <mcasadevall@ubuntu.com>  Mon, 17 May 2010 13:59:28 -0400
 
 livecd-rootfs (1.115) maverick; urgency=low
 
diff --git a/livecd.sh b/livecd.sh
index 2507b339..9ded55c1 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -656,30 +656,29 @@ Pin-Priority: 550
     perl -i -nle 'print unless /^Package: language-(pack|support)/ .. /^$/;' \
         ${ROOT}/var/lib/apt/extended_states
 
-  # And run the cleanup function dead last, to umount /proc after nothing
-  # else needs to be run in the chroot (umounting it earlier breaks rm):
-  cleanup
+    # And run the cleanup function dead last, to umount /proc after nothing
+    # else needs to be run in the chroot (umounting it earlier breaks rm):
+    cleanup
 
-  # Squashfs does not report unpacked disk space usage, which is explained at
-  # <http://lkml.org/lkml/2006/6/16/163>.  However, we would like to cache this
-  # number for partman's sufficient free space check and ubiquity's
-  # installation progress calculation.
-  printf $(du -sx --block-size=1 ${ROOT} | cut -f1) > livecd.${FSS}.size || true
+    # Squashfs does not report unpacked disk space usage, which is explained at
+    # <http://lkml.org/lkml/2006/6/16/163>.  However, we would like to cache this
+    # number for partman's sufficient free space check and ubiquity's
+    # installation progress calculation.
+    printf $(du -sx --block-size=1 ${ROOT} | cut -f1) > livecd.${FSS}.size || true
 
 
-  # Build our images
-  if [ "$IMAGE_FORMAT" = "ext2" ] || [ "$IMAGE_FORMAT" = "ext3" ]; then
-      livefs_ext2
-  else
-      livefs_squash
-  fi
+    # Build our images
+    if [ "$IMAGE_FORMAT" = "ext2" ] || [ "$IMAGE_FORMAT" = "ext3" ]; then
+        livefs_ext2
+    else
+        livefs_squash
+    fi
 
-  # Upgrade ext2->ext3 if that's what is requested
-  if [ "$IMAGE_FORMAT" = "ext3" ]; then
-      tune2fs -j livecd.${FSS}.ext2
-      mv livecd.${FSS}.ext2 livecd.${FSS}.ext3
-  fi
-exit
+    # Upgrade ext2->ext3 if that's what is requested
+    if [ "$IMAGE_FORMAT" = "ext3" ]; then
+        tune2fs -j livecd.${FSS}.ext2
+        mv livecd.${FSS}.ext2 livecd.${FSS}.ext3
+    fi
 
     # LTSP chroot building (only in 32bit and for Edubuntu (DVD))
     case $FS in