diff options
| author | Ben Howard <ben.howard@canonical.com> | 2012-04-02 17:02:30 -0600 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2012-04-02 17:02:30 -0600 |
| commit | b47e48251878e92931d06288c5e964041699f7e0 (patch) | |
| tree | 96b1d2f3c785cef41e0f73bb9935b09318b6706b | |
| parent | be4d5f0f5293760ce20614ba7da35278ef1932ab (diff) | |
| download | vyos-cloud-init-b47e48251878e92931d06288c5e964041699f7e0.tar.gz vyos-cloud-init-b47e48251878e92931d06288c5e964041699f7e0.zip | |
Fixed deficiency in merge proposal.
| -rwxr-xr-x | profile.d/Z99-cloud-locale-test.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/profile.d/Z99-cloud-locale-test.sh b/profile.d/Z99-cloud-locale-test.sh index b4a40a09..bbd2ca7a 100755 --- a/profile.d/Z99-cloud-locale-test.sh +++ b/profile.d/Z99-cloud-locale-test.sh @@ -1,4 +1,3 @@ -export FOO=bar #!/bin/sh # vi: ts=4 noexpandtab # @@ -69,16 +68,15 @@ locale_warn() { done printf "To see all available language packs, run:\n" - printf " apt-cache search \"^language-pack-*\"\n" - printf "To see the current locale settings, run 'locale'\n" - printf "This message can be disabled by running:\n" - printf " touch /var/lib/cloud/instance/locale.skip\n" + printf " apt-cache search \"^language-pack-[a-z][a-z]$\"\n" + printf "To disable for all users, run:\n" + printf " sudo touch /var/lib/cloud/instance/locale-check.skip\n" + printf "To disable this check for this user only, run: \n" + printf " touch ~/.locale-test.skip \n" printf "_____________________________________________________________________\n\n" } -[ -f /var/lib/cloud/instance/locale.skip ] && return +[ -f /home/${USER}/.locale-test.skip -o -f /var/lib/cloud/instance/locale-check.skip ] || + locale 2>&1 | locale_warn -locale_warn <<EOF -$(locale 2>&1) -EOF unset locale_warn |