From 786370819ca543f577c36dd622d5aa6055a5a2d3 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 26 Sep 2017 22:39:09 -0400 Subject: [PATCH] Make the 999-cpc-fixes.chroot subproject-aware, so we don't try to locale-gen --- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index 633f8d66..d1fc8abf 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -3,6 +3,8 @@ rootd="${1:-/}" root_fs_label=cloudimg-rootfs set -ex +. /root/config/chroot + CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process" LANG=C @@ -57,7 +59,9 @@ _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*' ## -------------- -_xchroot "${rootd}" locale-gen en_US.utf8 +if [ "${SUBPROJECT:-}" != minimize ]; then + _xchroot "${rootd}" locale-gen en_US.utf8 +fi ## -------------- # We continue to pre-generate en_US.UTF-8 locale above, but the default locale