Import patches-unapplied version 2.26 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 4236d780d05d59e02d79c8ae6e0685a503af5b09

New changelog entries:
  * make sure flash-kernel is not executed during build, this setting wasn't
    transitioned from livecd.sh yet
This commit is contained in:
Oliver Grawert 2011-08-18 11:55:54 +02:00 committed by usd-importer
parent 4236d780d0
commit b73e09ae50
2 changed files with 8 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.26) oneiric; urgency=low
* make sure flash-kernel is not executed during build, this setting wasn't
transitioned from livecd.sh yet
-- Oliver Grawert <ogra@ubuntu.com> Thu, 18 Aug 2011 11:55:54 +0200
livecd-rootfs (2.25) oneiric; urgency=low
* include the md5 sum of the rootfs tarball in the initrd, so the installer

View File

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