Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-10 18:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Steve Langasek 2017-09-26 22:39:09 -04:00 committed by Balint Reczey
parent e6bbe5f8a5
commit 786370819c
1 changed files with 5 additions and 1 deletions

6
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