[SCM] live-build branch, debian, updated. debian/3.0_a18-1-9-gcf8f6ce

Daniel Baumann daniel at debian.org
Sat Jun 11 09:09:07 UTC 2011


The following commit has been merged in the debian branch:
commit a951e84c4f8da02edd20c7a36656f37b59bc1898
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jun 5 11:15:17 2011 +0200

    Updating default kernel flavour for debian on i386.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 1214b93..5d0761a 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -634,7 +634,15 @@ Set_defaults ()
 							;;
 
 						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
+							case "${LB_DISTRIBUTION}" in
+								sid)
+									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
+									;;
+
+								*)
+									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
+									;;
+							esac
 							;;
 					esac
 					;;

-- 
live-build



More information about the debian-live-changes mailing list