Import patches-unapplied version 2.441.1 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 0031d747ac3e49c1cd8a312bb57b4604e9eef65d

New changelog entries:
  * Setup kernel properly for ubuntu-server:live; we *do* want to build
    kernel-generic and initrd-generic for this image. (LP: #1682460)
This commit is contained in:
Mathieu Trudel-Lapierre 2017-04-13 11:14:09 -04:00 committed by usd-importer
parent 0031d747ac
commit 170a7577de
2 changed files with 11 additions and 2 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.441.1) zesty; urgency=medium
* Setup kernel properly for ubuntu-server:live; we *do* want to build
kernel-generic and initrd-generic for this image. (LP: #1682460)
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Thu, 13 Apr 2017 11:14:09 -0400
livecd-rootfs (2.441) zesty; urgency=medium
[ Balint Reczey ]

View File

@ -587,8 +587,10 @@ case $ARCH in
;;
esac
case $PROJECT in
ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom)
case $PROJECT:$SUBPROJECT in
ubuntu-server:live)
;;
ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false