From 72764d349f4854633d0564c8261ffcb0ee1da1aa Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont@debian.org>
Date: Fri, 30 Sep 2005 01:10:19 +0000
Subject: [PATCH] switch on e2fs-zero.py

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

diff --git a/debian/changelog b/debian/changelog
index fc7661e1..1ef7896a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,13 @@ livecd-rootfs (0.24) hoary-cat-UNRELEASED; urgency=low
 
   * Incorporate e2fs-zero.py from Paul Sladen:
     http://www.paul.sladen.org/ubuntu/e2fszero/e2fs-zero.py
+    And use it instead of partimage.  Suggest: partimage instead of
+    Recommends.
   * Print package version during script run.
   * some HPPA fixes, allow architectures to have more than just main.
   * add debian/compat
 
- -- LaMont Jones <lamont@ubuntu.com>  Sat, 24 Sep 2005 15:54:09 -0600
+ -- LaMont Jones <lamont@ubuntu.com>  Thu, 29 Sep 2005 19:07:57 -0600
 
 livecd-rootfs (0.23) hoary-cat; urgency=low
 
diff --git a/debian/control b/debian/control
index 6e9ab6dd..93f295cb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.1.0
 Package: livecd-rootfs
 Architecture: all
 Depends: debootstrap, rsync, cloop-utils, python-minimal|python, procps
-Recommends: partimage
+Suggests: partimage
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem
  on the livecd.
diff --git a/debian/rules b/debian/rules
index dfab1ffb..97bf5565 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ install: build
 
 	# Add here commands to install the package into debian/<packagename>
 	#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
-	install -m755 livecd.sh debian/livecd-rootfs/usr/sbin
+	install -m755 livecd.sh e2fs-zero.py debian/livecd-rootfs/usr/sbin
 
 # Build architecture-dependent files here.
 binary-arch: build install
diff --git a/livecd.sh b/livecd.sh
index 3106dad3..e7f14b35 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -278,11 +278,13 @@ deb-src ${SRCMIRROR} ${STE}-security ${COMP}
 	mount $DEV livecd.mnt
 	rsync -a --delete --inplace --no-whole-file ${ROOT} livecd.mnt
 	umount $DEV
-	rm -rf partimg-${IMGNAME}.*
-	if [ -x /usr/sbin/partimage ]; then
-	  partimage -b -z0 --nodesc -f3 -c -o -y save $DEV partimg-${IMGNAME}
-	  cat partimg-${IMGNAME}.*|partimage -b -z0 --nodesc -e -f3 -c -o -y restore $DEV stdin
-	fi
+	#rm -rf partimg-${IMGNAME}.*
+	#if [ -x /usr/sbin/partimage ]; then
+	#  partimage -b -z0 --nodesc -f3 -c -o -y save $DEV partimg-${IMGNAME}
+	#  cat partimg-${IMGNAME}.*|partimage -b -z0 --nodesc -e -f3 -c -o -y restore $DEV stdin
+	#else
+	  /usr/sbin/e2fs-zero.py new-${IMGNAME}
+	#fi
 	losetup -d $DEV
 	mv new-${IMGNAME} ${IMGNAME}
 	cp ${IMGNAME} old-${IMGNAME}