diff options
| author | Varac <varac@leap.se> | 2016-12-08 22:41:04 +0000 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2016-12-08 22:41:04 +0000 |
| commit | 74f3f501aab17dc5d660af5d175c52bbcab5c5fe (patch) | |
| tree | 2d7a5aefc30ab1ee845a20713bba8218f773b10f | |
| parent | 3c4b29162e17960108a92ecc71274ecc4c9c3f76 (diff) | |
| parent | c641fe08f26dce1c06ed61dc2d5a8b75486807fe (diff) | |
Merge branch 'master' into 'master'
Ignore non-existing locale.gen on init (#8649)
See merge request !55
| -rwxr-xr-x | bin/node_init | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/node_init b/bin/node_init index b55cfed3..148ecc34 100755 --- a/bin/node_init +++ b/bin/node_init @@ -22,7 +22,7 @@ if ! egrep -q "$DEBIAN_VERSION" /etc/debian_version; then exit 1 fi mkdir -p $LEAP_DIR -if ! grep -q -e '^en_US.UTF-8' /etc/locale.gen; then +if ! grep -q -e '^en_US.UTF-8' /etc/locale.gen 2> /dev/null; then echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen /usr/sbin/locale-gen fi |