Description: Use i386 -generic-pae kernel flavour on Ubuntu >= precise
Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/897786
Forwarded: no
Last-Update: 2011-12-15

Index: b/functions/defaults.sh
===================================================================
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -628,7 +628,14 @@
 					;;
 
 				ubuntu)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+					case "${LB_DISTRIBUTION}" in
+						lucid|maverick|natty|oneiric)
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+							;;
+						*)
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
+							;;
+					esac
 					;;
 
 				*)
Index: b/scripts/build/lb_binary_debian-installer
===================================================================
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -319,7 +319,14 @@
 
 			case "${LB_MODE}" in
 				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+					case "${LB_DISTRIBUTION}" in
+						lucid|maverick|natty|oneiric)
+							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+							;;
+						*)
+							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
+							;;
+					esac
 					;;
 
 				*)