[SCM] live-build branch, debian-next, updated. debian/3.0_a18-1-4-ga951e84
Daniel Baumann
daniel at debian.org
Sun Jun 5 09:15:06 UTC 2011
The following commit has been merged in the debian-next branch:
commit 91ae1c536631ce9444136d4692931f9c6f724d13
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jun 5 11:14:08 2011 +0200
Updating default kernel flavour for progress on i386.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 9463451..1214b93 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -612,7 +612,15 @@ Set_defaults ()
i386)
case "${LB_MODE}" in
progress)
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686}"
+ case "${LB_DISTRIBUTION}" in
+ artax)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686}"
+ ;;
+
+ *)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
+ ;;
+ esac
;;
ubuntu)
--
live-build
More information about the debian-live-changes
mailing list