From 05fc9658915bfbd1006d9ff8da83fd34df2c78d1 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 23 Aug 2016 13:34:07 -0700
Subject: locale improvements: allow non-english locales in node_init, enforce
 UTF8 locale for `puppet apply`.

---
 bin/node_init | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'bin/node_init')

diff --git a/bin/node_init b/bin/node_init
index da250012..ea4c29c5 100644
--- a/bin/node_init
+++ b/bin/node_init
@@ -22,7 +22,9 @@ if ! egrep -q "$DEBIAN_VERSION" /etc/debian_version; then
   exit 1
 fi
 mkdir -p $LEAP_DIR
-echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
+if ! grep -q -e '^en_US.UTF-8' /etc/locale.gen; then
+  echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+fi
 
 #
 # UPDATE PACKAGES
-- 
cgit v1.2.3


From 441a488ac13a6a3cf50d2185f4611f13b54483e7 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 29 Aug 2016 21:18:03 -0700
Subject: add exec bit on bin/node_init

---
 bin/node_init | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/node_init

(limited to 'bin/node_init')

diff --git a/bin/node_init b/bin/node_init
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From d2defb63bba82eb3e6d3cc8885826d8b5a82ed0e Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Tue, 4 Oct 2016 23:55:52 +0200
Subject: generate utf8 locale solves #8511

---
 bin/node_init | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/node_init')

diff --git a/bin/node_init b/bin/node_init
index ea4c29c5..12d491c4 100755
--- a/bin/node_init
+++ b/bin/node_init
@@ -24,6 +24,7 @@ fi
 mkdir -p $LEAP_DIR
 if ! grep -q -e '^en_US.UTF-8' /etc/locale.gen; then
   echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+  /usr/sbin/locale-gen
 fi
 
 #
-- 
cgit v1.2.3


From 0bafc5e17a465969673e6807d3e6e7d7668ec481 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 18 Oct 2016 11:28:03 -0400
Subject: Do a dist-upgrade in 'node init'.

Starting with a recent debian stable point release update, it is
possible that the system is in an inconsistent library state. For
example, puppet could not be run because the libraries on the system
were not the ones that the puppet package was built against. So that
means that deploys could not happen until we've dont a dist-upgrade.
---
 bin/node_init | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/node_init')

diff --git a/bin/node_init b/bin/node_init
index 12d491c4..b55cfed3 100755
--- a/bin/node_init
+++ b/bin/node_init
@@ -52,6 +52,8 @@ if [[ $error_count > 0 ]]; then
   exit 1
 fi
 
+/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade
+
 #
 # UPDATE TIME
 #
-- 
cgit v1.2.3