Import patches-unapplied version 2.6 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: d234b27412

New changelog entries:
  * '--initramfs none' produces *.packages* outputs rather than *.manifest*;
    handle this.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.6) oneiric; urgency=low
+
+  * '--initramfs none' produces *.packages* outputs rather than *.manifest*;
+    handle this.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 16 Jun 2011 12:59:09 +0100
+
 livecd-rootfs (2.5) oneiric; urgency=low
 
   * Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.

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