From 757cfb724fa34dad889175ccee95fc8163962c3e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 14 Jun 2011 08:30:10 +0100
Subject: [PATCH] Import patches-unapplied version 2.2 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 077420d054f3efeb51979fdc34ed936cecb1a2ea

New changelog entries:
  * Pass --linux-flavours to lb config if necessary.
---
 debian/changelog       | 6 ++++++
 live-build/auto/config | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e96334c..2535f971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.2) oneiric; urgency=low
+
+  * Pass --linux-flavours to lb config if necessary.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 14 Jun 2011 08:30:10 +0100
+
 livecd-rootfs (2.1) oneiric; urgency=low
 
   * Fix ordering of log file creation in BuildLiveCD.
diff --git a/live-build/auto/config b/live-build/auto/config
index 5c82cd0a..83a674c4 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -147,6 +147,7 @@ lb config noauto \
 	${MIRROR:+--parent-mirror-bootstrap $MIRROR} \
 	${COMPONENTS:+--parent-archive-areas "$COMPONENTS"} \
 	--package-lists none \
+	${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \
 	--initsystem none \
 	--bootloader none \
 	--initramfs-compression lzma \