Merge lp:~vorlon/livecd-rootfs/initramfsless-everywhere

sil2100/raspi-wpasupplicant
Steve Langasek 6 years ago
commit 8f910aab4b

7
debian/changelog vendored

@ -11,6 +11,13 @@ livecd-rootfs (2.543) UNRELEASED; urgency=medium
* Avoid issues of hard-linking to a symbolic vmlinuz as this can lead to a
dangling symlink.
[ Steve Langasek ]
* 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 time for cases where it does not.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 18 Sep 2018 10:21:30 +0200
livecd-rootfs (2.542) cosmic; urgency=medium

@ -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

@ -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.

Loading…
Cancel
Save