Make the 999-cpc-fixes.chroot subproject-aware, so we don't try to locale-gen

core-include-dmsetup
Steve Langasek 7 years ago committed by Balint Reczey
parent 95b06ff341
commit 86108d69d9

@ -3,6 +3,8 @@ rootd="${1:-/}"
root_fs_label=cloudimg-rootfs root_fs_label=cloudimg-rootfs
set -ex set -ex
. /root/config/chroot
CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process" CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
LANG=C LANG=C
@ -87,7 +89,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}" sh -c 'rm -f /etc/ssh/ssh_host_[rd]sa_key*'
## -------------- ## --------------
if [ "${SUBPROJECT:-}" != minimize ]; then
_xchroot "${rootd}" locale-gen en_US.utf8 _xchroot "${rootd}" locale-gen en_US.utf8
fi
## -------------- ## --------------
# set cloud-init to be on # set cloud-init to be on

Loading…
Cancel
Save