openstack/diskimage-builder
Code Issues Proposed changes

Merge "Fix debian-minimal image building"

Browse Source
This commit is contained in:
Jenkins 2016-01-29 04:32:24 +00:00 committed by Gerrit Code Review
commit 4b1b813a68
3 changed files with 2 additions and 2 deletions
elements
debian-minimal
element-deps
debian
package-installs.yaml
debootstrap/install.d
12-debian-locale-gen

1
elements/debian-minimal/element-deps

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

1
elements/debian/package-installs.yaml

@ -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

@ -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