Merge "Fix debian-minimal image building"

2016-01-29 04:32:24 +00:00 · 2016-01-29 04:32:24 +00:00 · 4b1b813a68
commit 4b1b813a68
parent c31a59a2c9 78278405ce
3 changed files with 2 additions and 2 deletions
--- a/elements/debian-minimal/element-deps
+++ b/elements/debian-minimal/element-deps
@ -1,2 +1 @@
 debootstrap
-package-installs
--- a/elements/debian/package-installs.yaml
+++ b/elements/debian/package-installs.yaml
@ -10,4 +10,3 @@ net-tools:
 cloud-init:
 cloud-utils:
 cloud-initramfs-growroot:
-locales-all:
--- a/elements/debootstrap/install.d/12-debian-locale-gen
+++ b/elements/debootstrap/install.d/12-debian-locale-gen
@ -21,6 +21,8 @@ fi
 set -eu
 set -o pipefail

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