From 1f87003934a0a5c113855f20cb2f7713d3e755f7 Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont.jones@canonical.com>
Date: Fri, 7 Jan 2005 23:56:56 +0000
Subject: [PATCH] cleanup

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

diff --git a/debian/changelog b/debian/changelog
index b2a1a0ca..c65eaa83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 livecd-rootfs (0.2) hoary; urgency=low
 
   * Better divertion setup, fix sources.list
+  * copyright in file.
+  * Flush postfix's queue of the install mail
 
  -- LaMont Jones <lamont@debian.org>  Fri,  7 Jan 2005 13:00:37 -0700
 
diff --git a/livecd.sh b/livecd.sh
index 639ec98d..23599354 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -1,4 +1,8 @@
-#!/bin/sh -xe
+#!/bin/sh -eu
+
+#################################################################
+#### (c) Copyright 2004 Canonical Ltd.  All rights reserved. ####
+#################################################################
 
 # Depends: debootstrap, rsync, cloop-utils, python
 
@@ -140,11 +144,15 @@ mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
 # get rid of the .debs - we don't need them.
 chroot ${ROOT} apt-get clean
 rm ${ROOT}var/lib/apt/lists/*_*
+rm ${ROOT}var/spool/postfix/maildrop/*
 
 # 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
+rm -f $IMG
 dd if=/dev/zero of=$IMG seek=$SZ bs=1024 count=1
-if [-n "$UINUM" ]; then
+INUM=""
+if [ -n "$UINUM" ]; then
     INUM="-N "$(python -c "print $(find ${ROOT} | wc -l)+$UINUM")
 fi
 mke2fs $INUM -Osparse_super -F $IMG