CLOUDSTACK-7143: split locale config into its own file

This commit is contained in:
Leo Simons 2014-07-21 11:15:23 +02:00 committed by Rohit Yadav
parent 3f8c31b0da
commit aa14a619a6
3 changed files with 14 additions and 13 deletions

View File

@ -0,0 +1,13 @@
fix_locale() {
cat >> /etc/default/locale << EOF
LANG=en_US.UTF-8
LC_ALL=en_US.UTF-8
EOF
cat >> /etc/locale.gen << EOF
en_US.UTF-8 UTF-8
EOF
locale-gen en_US.UTF-8
}
fix_locale

View File

@ -60,6 +60,7 @@ config = {
'build_time.sh',
'apt_upgrade.sh',
'configure_grub.sh',
'configure_locale.sh',
'configure_login.sh',
'postinstall.sh',
'cleanup.sh',

View File

@ -140,18 +140,6 @@ fix_hostname() {
sed -i '/127.0.1.1/d' /etc/hosts
}
fix_locale() {
cat >> /etc/default/locale << EOF
LANG=en_US.UTF-8
LC_ALL=en_US.UTF-8
EOF
cat >> /etc/locale.gen << EOF
en_US.UTF-8 UTF-8
EOF
locale-gen en_US.UTF-8
}
# This is actually a bug in the conntrackd package. The comment in the conf file says stats logging is off by default but the parameter is set to on.
# After a couple weeks logrotate will rotate the conntrackd-stats.log file ans start conntracking even if we don't want it to (on non-redundant routers for instance).
fix_conntrackd() {
@ -178,7 +166,6 @@ do_fixes() {
fix_nameserver
fix_acpid
fix_hostname
fix_locale
fix_conntrackd
fix_vhdutil
fix_modules