summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Rebischke <Chris.Rebischke@posteo.de>2017-07-05 19:19:23 +0200
committerChristian Rebischke <Chris.Rebischke@posteo.de>2017-07-05 19:19:23 +0200
commit497b87a624db752ceb2556af3f37b653cf7d73b1 (patch)
tree03e5b2fc572ed3fdd284d8414ba7c2c7d12fee43
parentffe59f1d4be3b285ed619932677fc891c3bbecbf (diff)
parent24474750bbdd4afef5a0f2b304da1f481b2e842b (diff)
downloadarch-boxes32-497b87a624db752ceb2556af3f37b653cf7d73b1.tar.xz
Merge branch 'master' of https://github.com/shibumi/arch-boxes
-rw-r--r--http/install-chroot.sh1
-rw-r--r--provision/postinstall.sh1
2 files changed, 1 insertions, 1 deletions
diff --git a/http/install-chroot.sh b/http/install-chroot.sh
index 8cfb7d5..7e71282 100644
--- a/http/install-chroot.sh
+++ b/http/install-chroot.sh
@@ -6,6 +6,7 @@ set -x
ln -sf /usr/share/zoneinfo/UTC /etc/localtime
sed -i -e 's/^#\(en_US.UTF-8\)/\1/' /etc/locale.gen
locale-gen
+echo 'LANG=en_US.UTF-8' > /etc/locale.conf
# setting vagrant user credentials
echo -e 'vagrant\nvagrant' | passwd
diff --git a/provision/postinstall.sh b/provision/postinstall.sh
index be094e4..58e05aa 100644
--- a/provision/postinstall.sh
+++ b/provision/postinstall.sh
@@ -5,7 +5,6 @@ set -x
# setting hostname, locales, etc
hostnamectl set-hostname "archlinux"
-localectl set-locale "LANG=en_US.UTF-8"
localectl set-keymap "us"
localectl set-x11-keymap "us"
timedatectl set-ntp true