sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix debian-minimal image building

Browse Source 
'locales' package gets installed before '12-debian-locale-gen' is executed
and generates effectively empty /etc/locales.gen in debian, which makes
dpkg-reconfigure call to locales ignore the values set by
debconf-set-selections.
* Remove /etc/locale.gen generated by 'locales' installation to ensure
  proper locales generation on debian images
* Remove 'locales-all' package installation from debian element since
  it's not needed anymore to build the image and cosnumes additional
  ~120MB of space
* Remove unused 'package-installs' dependency from debian-minimal
  element

Change-Id: Ic39ba2b5ceb5018efb75742547b2babf80827e56
Closes-Bug: #1452400
This commit is contained in:
Igor Belikov 2016-01-28 16:28:58 +03:00
parent fbd437fea6
commit 78278405ce
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/debian-minimal/element-deps
View File

@ -1,2 +1 @@
debootstrap debootstrap
package-installs

1
elements/debian/package-installs.yaml
View File

@ -10,4 +10,3 @@ net-tools:
cloud-init: cloud-init:
cloud-utils: cloud-utils:
cloud-initramfs-growroot: cloud-initramfs-growroot:
locales-all:

2
elements/debootstrap/install.d/12-debian-locale-gen
View File

@ -21,6 +21,8 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
[ -f /etc/locale.gen ] && rm /etc/locale.gen
debconf-set-selections - <<EOF debconf-set-selections - <<EOF
locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
# Choices: None, C.UTF-8, en_US.UTF-8 # Choices: None, C.UTF-8, en_US.UTF-8