Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-07-03 04:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use kvm kernel flavor for minimized cloud image, not virtual

Browse Source
This commit is contained in:
Steve Langasek 2017-10-04 17:41:08 +00:00
parent dfb4c593b1
commit 4a4bac20f6
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -44,6 +44,7 @@ livecd-rootfs (2.408.19) UNRELEASED; urgency=medium
[ Steve Langasek ] [ Steve Langasek ]
* debian/tests/default-bootstraps: minor adjustments to shell syntax, * debian/tests/default-bootstraps: minor adjustments to shell syntax,
syncing with artful where this originated. syncing with artful where this originated.
* Use kvm kernel flavor for minimized cloud image, not virtual
-- Balint Reczey <rbalint@ubuntu.com> Tue, 03 Oct 2017 17:35:04 +0200 -- Balint Reczey <rbalint@ubuntu.com> Tue, 03 Oct 2017 17:35:04 +0200

16
live-build/auto/config
View File

@ -502,14 +502,28 @@ case $PROJECT in
if [ "${SUBPROJECT:-}" = minimized ]; then if [ "${SUBPROJECT:-}" = minimized ]; then
add_task install cloud-image add_task install cloud-image
add_package install sudo add_package install sudo
# linux-kvm currently only exists in xenial, not in
# non-LTS suites. Fall back to virtual flavor, which
# may or may not boot initramfsless but enables us to
# test building and possibly build derivative images
# using other kernel flavors.
# If you enable an extra ppa, it is assumed that
# linux-kvm is available since you control the
# archive and can provide this metapackage as
# necessary.
if [ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]; then
KERNEL_FLAVOURS=virtual
else
KERNEL_FLAVOURS=kvm
fi
else else
add_task install minimal standard cloud-image add_task install minimal standard cloud-image
add_package install ubuntu-minimal add_package install ubuntu-minimal
KERNEL_FLAVOURS=virtual
fi fi
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--initramfs=none"
KERNEL_FLAVOURS=virtual
case $ARCH in case $ARCH in
armhf) armhf)
KERNEL_FLAVOURS=generic-lpae KERNEL_FLAVOURS=generic-lpae