Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 02:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Steve Langasek 2018-11-02 14:39:42 -07:00
commit 8f910aab4b
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 * Avoid issues of hard-linking to a symbolic vmlinuz as this can lead to a
dangling symlink. 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 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 18 Sep 2018 10:21:30 +0200
livecd-rootfs (2.542) cosmic; urgency=medium livecd-rootfs (2.542) cosmic; urgency=medium

2
live-build/ubuntu-cpc/hooks/032-disk-image.binary
View File

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

2
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
View File

@ -64,7 +64,7 @@ install_grub() {
efi_boot_dir="/boot/efi/EFI/BOOT" efi_boot_dir="/boot/efi/EFI/BOOT"
chroot mountpoint mkdir -p "${efi_boot_dir}" 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 # FIXME: code duplicated between 032-disk-image.binary
# and 033-disk-image-uefi.binary. We want to fix this to not # and 033-disk-image-uefi.binary. We want to fix this to not
# have initramfs-tools installed at all on these images. # have initramfs-tools installed at all on these images.