[SCM] live-build branch, debian, updated. debian/3.0_a60-1-10-gf735d98

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 01b64bf2b9b99df5dbeb7211646f5203a4f7bc00
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Sun Sep 30 09:28:16 2012 +0200

    Using i386 -generic-pae kernel flavour on Ubuntu precise.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index e1c640c..872dd53 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -717,7 +717,14 @@ Set_defaults ()
 					;;
 
 				ubuntu|kubuntu)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+					case "${LB_DISTRIBUTION}" in
+						precise)
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
+							;;
+						*)
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+							;;
+					esac
 					;;
 
 				*)
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index 1a85439..9720961 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -357,7 +357,14 @@ then
 
 			case "${LB_MODE}" in
 				ubuntu|kubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+					case "${LB_DISTRIBUTION}" in
+						precise)
+							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
+							;;
+						*)
+							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+							;;
+					esac
 					;;
 
 				*)

-- 
live-build