Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu-cpc: Fixup comment references to file names post-parallelization

Browse Source
This commit is contained in:
Robert C Jennings 2019-05-02 15:48:46 -05:00
parent 51bd9d5b4a
commit f493132f90
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -65,8 +65,8 @@ install_grub() {
chroot mountpoint mkdir -p "${efi_boot_dir}" chroot mountpoint mkdir -p "${efi_boot_dir}"
if [ -n "$partuuid" ]; then if [ -n "$partuuid" ]; then
# FIXME: code duplicated between 032-disk-image.binary # FIXME: code duplicated between disk-image.binary
# and 033-disk-image-uefi.binary. We want to fix this to not # and 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.
echo "partuuid found for root device; omitting initrd" echo "partuuid found for root device; omitting initrd"
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.d/base/root-squashfs.binary
View File

@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then
exit 0 exit 0
fi 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 rootfs_dir=rootfs.dir
squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs" squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs"

2
live-build/ubuntu-cpc/hooks.d/base/root-xz.binary
View File

@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then
exit 0 exit 0
fi 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 rootfs_dir=rootfs.dir
cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest

2
live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary
View File

@ -7,7 +7,7 @@
# and checksums. This step produces an OVA that is suitable for use with # and checksums. This step produces an OVA that is suitable for use with
# Cloud's that support the OVF specification. # 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 case ${SUBPROJECT:-} in
minimized) minimized)