diff --git a/live-build/auto/build b/live-build/auto/build index 2bcbf1de..6fc4459d 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -31,14 +31,14 @@ Expire-Date: 0 lb bootstrap "$@" - if [ "$SUBPROJECT" = minimize ] \ + if [ "$SUBPROJECT" = minimized ] \ && ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then # workaround for tzdata purge not removing these files rm -f chroot/etc/localtime chroot/etc/timezone fi - if [ "$SUBPROJECT" = minimize ]; then - # set up dpkg filters to skip installing docs on minimized system + if [ "$SUBPROJECT" = minimized ]; then + # set up dpkg filters to skip installing docs on minimizedd system mkdir -p chroot/etc/dpkg/dpkg.cfg.d cat > chroot/etc/dpkg/dpkg.cfg.d/excludes <> mountpoint/etc/default/grub.d/40-force-partuuid diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary index 0ac9da59..2e98e356 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -61,7 +61,7 @@ install_grub() { efi_boot_dir="/boot/efi/EFI/BOOT" chroot mountpoint mkdir -p "${efi_boot_dir}" - if [ "${SUBPROJECT:-}" = minimize ] && [ -n "$partuuid" ]; then + if [ "${SUBPROJECT:-}" = minimized ] && [ -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. diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index efbd7193..4a2df66e 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -89,7 +89,7 @@ _xchroot "${rootd}" sh -c 'sed -i "/^127.0.1.1/d" /etc/hosts' _xchroot "${rootd}" sh -c 'rm -f /etc/ssh/ssh_host_[rd]sa_key*' ## -------------- -if [ "${SUBPROJECT:-}" != minimize ]; then +if [ "${SUBPROJECT:-}" != minimized ]; then _xchroot "${rootd}" locale-gen en_US.utf8 fi