Unconditionally set GRUB_FORCE_PARTUUID in cloud images; as of version

2.02+dfsg1-5ubuntu5 grub will automatically fall back to booting with an
initrd if one is available, so we can now always attempt initramfsless
boot for cloud images which almost always works and causes only minimal
increase in boot speed for cases where it does not.
This commit is contained in:
Steve Langasek 2018-10-03 17:21:56 -07:00
parent b85cf0fc58
commit b6dedb62ce
3 changed files with 12 additions and 2 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.542) UNRELEASED; urgency=medium
* Unconditionally set GRUB_FORCE_PARTUUID in cloud images; as of version
2.02+dfsg1-5ubuntu5 grub will automatically fall back to booting with an
initrd if one is available, so we can now always attempt initramfsless
boot for cloud images which almost always works and causes only minimal
increase in boot speed for cases where it does not.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 03 Oct 2018 17:13:46 -0700
livecd-rootfs (2.541) cosmic; urgency=medium
[ Michael Hudson-Doyle ]

View File

@ -121,7 +121,7 @@ if [ "${should_install_grub}" -eq 1 ]; then
rm mountpoint/tmp/device.map
if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
if [ -n "$partuuid" ]; then
echo "partuuid found for root device; forcing it in Grub"
mkdir -p mountpoint/etc/default/grub.d
echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg

View File

@ -64,7 +64,7 @@ install_grub() {
efi_boot_dir="/boot/efi/EFI/BOOT"
chroot mountpoint mkdir -p "${efi_boot_dir}"
if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
if [ -n "$partuuid" ]; then
# FIXME: code duplicated between 032-disk-image.binary
# and 033-disk-image-uefi.binary. We want to fix this to not
# have initramfs-tools installed at all on these images.