From 98f27745b7fb6e65e0eb672a944a49b1def1d43c Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Thu, 28 Sep 2017 09:38:23 -0400 Subject: [PATCH] Drop initramfs-tools diversion Kernels which are able to boot without initramfs now dropped dependency on initramfs-tools thus initramfs-tools can be removed from the image instead of having to divert it to avoid initramfs generation. --- live-build/ubuntu-cpc/hooks/032-disk-image.binary | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary index 9a3e7ff0..d2c405de 100755 --- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary +++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary @@ -117,20 +117,7 @@ if [ "${should_install_grub}" -eq 1 ]; then rm mountpoint/tmp/device.map if [ "$SUBPROJECT" = minimize ] && [ -n "$partuuid" ]; then - echo "partuuid found for root device; omitting initrd" - chroot mountpoint dpkg-divert --add \ - --divert /usr/sbin/update-initramfs.divert-minimize \ - --rename /usr/sbin/update-initramfs - cat > mountpoint/usr/sbin/update-initramfs <<'EOF' -#! /bin/sh -echo "initramfs disabled on this system. To reenable, run:" >&2 -echo " sudo rm -f /usr/sbin/update-initramfs" >&2 -echo " sudo dpkg-divert --remove --rename /usr/sbin/update-initramfs" >&2 -exit 0 -EOF - chmod +x mountpoint/usr/sbin/update-initramfs - rm -f mountpoint/boot/initrd.img-* - + echo "partuuid found for root device; forcing it in Grub" echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub chroot mountpoint update-grub fi