drop FLASH_KERNEL_SKIP from live-build config, add FLASH_KERNEL_SKIP explicitly to the post build ac100 update-initramfs chroot call

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.34) UNRELEASED; urgency=low
+
+  * drop FLASH_KERNEL_SKIP from live-build config, flash-kernel suppression is 
+    handled through a diversion already.
+  * add FLASH_KERNEL_SKIP explicitly to the post build ac100 update-initramfs 
+    chroot call.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 24 Aug 2011 14:13:55 +0200
+
 livecd-rootfs (2.33) oneiric; urgency=low
 
   * BuildLiveCD: Add the subproject (if any) and the ubuntu-defaults-image

live-build/auto/build

@@ -193,7 +193,7 @@ if [ "$SUBARCH" = "ac100" ]; then
 	lb chroot_devpts install "$@"
 
 	# re-create initrd to contain the installer.md5 file
-	Chroot chroot "update-initramfs -k all -t -u -v"
+	Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k all -t -u -v"
 
 	# create boot.img
 	Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}"

live-build/auto/config

@@ -190,7 +190,6 @@ esac
 case $ARCH in
 	armel)
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
-		FLASH_KERNEL_SKIP=1
 		case $SUBARCH in
 			dove)
 				BINARY_REMOVE_LINUX=false