From ed52d04be566f3b8a6f5f5bee453543aee36920a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Thu, 16 Jun 2011 12:50:31 +0100
Subject: [PATCH] '--initramfs none' produces *.packages* outputs rather than
 *.manifest*; handle this.

---
 debian/changelog      |  7 +++++++
 live-build/auto/build | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d0546bf5..ebfea7bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.6) UNRELEASED; urgency=low
+
+  * '--initramfs none' produces *.packages* outputs rather than *.manifest*;
+    handle this.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 16 Jun 2011 12:48:38 +0100
+
 livecd-rootfs (2.5) oneiric; urgency=low
 
   * Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.
diff --git a/live-build/auto/build b/live-build/auto/build
index 6feb894b..26b812ec 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -59,6 +59,16 @@ for OUTPUT in ext2 ext3 manifest manifest-remove size squashfs; do
 	chmod 644 "$PREFIX.$OUTPUT"
 done
 
+# '--initramfs none' produces different manifest names.
+if [ -e "binary/$INITFS/filesystem.packages" ]; then
+	ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
+	chmod 644 "$PREFIX.manifest"
+fi
+if [ -e "binary/$INITFS/filesystem.packages-remove" ]; then
+	ln "binary/$INITFS/filesystem.packages-remove" "$PREFIX.manifest-remove"
+	chmod 644 "$PREFIX.manifest-remove"
+fi
+
 for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then