From f493132f909667b4558e18d7caa45c1530778495 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Thu, 2 May 2019 15:48:46 -0500 Subject: [PATCH] ubuntu-cpc: Fixup comment references to file names post-parallelization --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 4 ++-- live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary | 2 +- live-build/ubuntu-cpc/hooks.d/base/root-xz.binary | 2 +- live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index c176de46..d51bb7a2 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -65,8 +65,8 @@ install_grub() { chroot mountpoint mkdir -p "${efi_boot_dir}" 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 + # FIXME: code duplicated between disk-image.binary + # and disk-image-uefi.binary. We want to fix this to not # have initramfs-tools installed at all on these images. echo "partuuid found for root device; omitting initrd" echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg diff --git a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary index c6e2273e..eb2b5318 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary @@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then exit 0 fi -# This is the directory created by 031-0-create-root-dir.binary +# This is the directory created by create-root-dir.binary rootfs_dir=rootfs.dir squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs" diff --git a/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary b/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary index b23cd8d6..609538ad 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary @@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then exit 0 fi -# This is the directory created by 031-0-create-root-dir.binary +# This is the directory created by create-root-dir.binary rootfs_dir=rootfs.dir cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest diff --git a/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary index f9bcfb18..a827a8a6 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary @@ -7,7 +7,7 @@ # and checksums. This step produces an OVA that is suitable for use with # Cloud's that support the OVF specification. # -# For this step, we re-use the VMDK's made in 040-vmdk-image.binary +# For this step, we re-use the VMDK's made in vmdk-image.binary case ${SUBPROJECT:-} in minimized)