[SCM] live-build branch, debian, updated. debian/3.0_a46-1-21-g4b333fb

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit d2be2946dbe2fe059fa6c523c495694b2cfcba68
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Apr 23 12:35:10 2012 +0200

    Updating defaults for linux-latest metapackages in wheezy.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 4d2fe41..f4e2517 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -841,7 +841,15 @@ Set_defaults ()
 			;;
 
 		*)
-			LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image-2.6}"
+			case "${LB_DISTRIBUTION}" in
+				squeeze|artax)
+					LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image-2.6}"
+					;;
+
+				*)
+					LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
+					;;
+			esac
 			;;
 	esac
 

-- 
live-build