mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 19:31:31 +00:00
Imported 2.674
No reason for CPC update specified.
This commit is contained in:
parent
639728ec29
commit
2d7a0928eb
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
||||
livecd-rootfs (2.674) groovy; urgency=medium
|
||||
|
||||
[ David Krauser ]
|
||||
* Fix broken minimal cloud image boot on amd64
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 16 Jul 2020 15:40:15 -0700
|
||||
|
||||
livecd-rootfs (2.673) groovy; urgency=medium
|
||||
|
||||
* Fix an unbound variable in scripts/functions.
|
||||
|
@ -779,20 +779,14 @@ case $PROJECT in
|
||||
;;
|
||||
|
||||
ubuntu-cpc)
|
||||
KERNEL_FLAVOURS=virtual
|
||||
|
||||
if [ "${SUBPROJECT:-}" = minimized ]; then
|
||||
add_task install cloud-image
|
||||
add_package install sudo lxd-installer
|
||||
# linux-kvm currently only exists for amd64, so fall back to the
|
||||
# virtual flavour for other architectures
|
||||
if [ "$ARCH" = "amd64" ]; then
|
||||
KERNEL_FLAVOURS=kvm
|
||||
else
|
||||
KERNEL_FLAVOURS=virtual
|
||||
fi
|
||||
else
|
||||
add_task install minimal standard cloud-image
|
||||
add_package install ubuntu-minimal
|
||||
KERNEL_FLAVOURS=virtual
|
||||
case $ARCH in
|
||||
armhf|arm64|ppc64el|powerpc)
|
||||
add_task install server
|
||||
|
@ -947,6 +947,12 @@ replace_kernel () {
|
||||
|
||||
# If running a custom kernel, we should try to boot without an initramfs
|
||||
# We do this by setting GRUB_FORCE_PARTUUID, which forces initramfs-less boot
|
||||
force_boot_without_initramfs ${mountpoint}
|
||||
}
|
||||
|
||||
force_boot_without_initramfs() {
|
||||
mountpoint=$1
|
||||
|
||||
partuuid=$(blkid -s PARTUUID -o value $(findmnt -n -o SOURCE --target "${mountpoint}"))
|
||||
if [ -n "${partuuid}" ]; then
|
||||
echo "Force booting without an initramfs..."
|
||||
|
@ -94,15 +94,6 @@ install_grub() {
|
||||
;;
|
||||
esac
|
||||
|
||||
# This call to rewrite the debian package manifest is added here to capture
|
||||
# grub-efi packages that otherwise would not make it into the base
|
||||
# manifest. filesystem.packages is moved into place via symlinking to
|
||||
# livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs
|
||||
# and at that time snaps are added to the manifest (create-manifest is
|
||||
# not called here as it calls snap-seed-parse, resulting in duplicate
|
||||
# snap listings)
|
||||
chroot mountpoint dpkg-query -W > binary/boot/filesystem.packages
|
||||
|
||||
chroot mountpoint grub-install "${loop_device}" \
|
||||
--boot-directory=/boot \
|
||||
--efi-directory=/boot/efi \
|
||||
@ -126,6 +117,21 @@ install_grub() {
|
||||
chroot mountpoint grub-install --target=i386-pc "${loop_device}"
|
||||
fi
|
||||
|
||||
# Use the linux-kvm kernel for minimal images where available
|
||||
# linux-kvm currently only exists for amd64
|
||||
if [ "${SUBPROJECT:-}" = "minimized" ] && [ "$ARCH" = "amd64" ]; then
|
||||
replace_kernel mountpoint linux-kvm
|
||||
fi
|
||||
|
||||
# This call to rewrite the debian package manifest is added here to capture
|
||||
# grub-efi packages that otherwise would not make it into the base
|
||||
# manifest. filesystem.packages is moved into place via symlinking to
|
||||
# livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs
|
||||
# and at that time snaps are added to the manifest (create-manifest is
|
||||
# not called here as it calls snap-seed-parse, resulting in duplicate
|
||||
# snap listings)
|
||||
chroot mountpoint dpkg-query -W > binary/boot/filesystem.packages
|
||||
|
||||
divert_grub mountpoint
|
||||
chroot mountpoint update-grub
|
||||
replace_grub_root_with_label mountpoint
|
||||
|
@ -122,6 +122,12 @@ if [ "${should_install_grub}" -eq 1 ]; then
|
||||
rm mountpoint/tmp/device.map
|
||||
fi
|
||||
|
||||
# Use the linux-kvm kernel for minimal images where available
|
||||
# linux-kvm currently only exists for amd64
|
||||
if [ "${SUBPROJECT:-}" = "minimized" ] && [ "$ARCH" = "amd64" ]; then
|
||||
replace_kernel mountpoint linux-kvm
|
||||
fi
|
||||
|
||||
if [ "$ARCH" = "s390x" ]; then
|
||||
# Do ZIPL install bits
|
||||
chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware
|
||||
|
Loading…
x
Reference in New Issue
Block a user