summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2017-08-29 12:26:28 +0200
committerRaphaël Hertzog <hertzog@debian.org>2017-08-29 12:26:33 +0200
commit2fe6afe46008c50ef7d3a9b505ca5cf28c355f3c (patch)
tree08f3be845fe3f9f86d0c79404ecd590a0160fed5
parentff71712590a809d0f7ba680e787a9f091ed853b2 (diff)
downloadvyos-live-build-2fe6afe46008c50ef7d3a9b505ca5cf28c355f3c.tar.gz
vyos-live-build-2fe6afe46008c50ef7d3a9b505ca5cf28c355f3c.zip
Initialize /etc/default/locale with LANG=C.UTF-8
That way we always have a valid UTF-8 locale even when we don't have the "locales" (or "locales-all") package installed.
-rw-r--r--debian/changelog3
-rwxr-xr-xshare/hooks/normal/0040-create-locales-files.hook.chroot2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c4f06ac7b..2420af072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ live-build (1:20170808) UNRELEASED; urgency=medium
* Add .disk/mkisofs file recording the xorriso command line. Thanks
to Thomas Schmitt <scdbackup@gmx.net> for the suggestion.
+ * Initialize /etc/default/locale with LANG=C.UTF-8 so that we always
+ have a valid UTF-8 locale even when we don't have the "locales"
+ package installed.
-- Raphaël Hertzog <hertzog@debian.org> Thu, 10 Aug 2017 14:53:06 +0200
diff --git a/share/hooks/normal/0040-create-locales-files.hook.chroot b/share/hooks/normal/0040-create-locales-files.hook.chroot
index 8a5a8677c..cd240608a 100755
--- a/share/hooks/normal/0040-create-locales-files.hook.chroot
+++ b/share/hooks/normal/0040-create-locales-files.hook.chroot
@@ -4,4 +4,4 @@ set -e
# Create /etc/environment and /etc/default/locale
touch /etc/environment
-touch /etc/default/locale
+echo "LANG=C.UTF-8" >/etc/default/locale