From 2ef2aee456bbc87a2c819bafa90aa1ea44808ecd Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.reczey@canonical.com>
Date: Fri, 29 Sep 2017 15:20:14 -0400
Subject: [PATCH] Use SUBPROJECT=minimized name instead of SUBPROJECT=minimize
 for consistency

---
 live-build/auto/build                                  | 6 +++---
 live-build/auto/config                                 | 4 ++--
 live-build/ubuntu-cpc/hooks/032-disk-image.binary      | 2 +-
 live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary | 2 +-
 live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index 96b35004..aa67ef7b 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -45,14 +45,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 <<EOF
 # Drop all man pages
diff --git a/live-build/auto/config b/live-build/auto/config
index 34ea8ec7..3bf7c604 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -238,7 +238,7 @@ esac
 
 SIGNED_KERNEL_PACKAGE="linux-signed-generic"
 
-if [ "$SUBPROJECT" = minimize ]; then
+if [ "$SUBPROJECT" = minimized ]; then
 	OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 fi
 
@@ -528,7 +528,7 @@ case $PROJECT in
 		;;
 
 	ubuntu-cpc)
-		if [ "$SUBPROJECT" = minimize ]; then
+		if [ "$SUBPROJECT" = minimized ]; then
 			add_task install cloud-image
 			add_package install sudo
 		else
diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
index 0af56470..0a538102 100755
--- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
@@ -121,7 +121,7 @@ if [ "${should_install_grub}" -eq 1 ]; then
 
     rm mountpoint/tmp/device.map
 
-	if [ "$SUBPROJECT" = minimize ] && [ -n "$partuuid" ]; then
+	if [ "$SUBPROJECT" = minimized ] && [ -n "$partuuid" ]; then
 		echo "partuuid found for root device; forcing it in Grub"
 		mkdir -p mountpoint/etc/default/grub.d
 		echo "GRUB_FORCE_PARTUUID=$partuuid" >> 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 5827a6fe..ca201bb7 100755
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@@ -62,7 +62,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 d1fc8abf..e59e38c8 100755
--- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
@@ -59,7 +59,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