Skip to content

Commit 051efd9

Browse files
weizhouapachedhslove
authored andcommitted
systemvm: fix duplicated "en_US.UTF-8 UTF-8" in /etc/locale.gen (apache#11823)
1 parent b777e5a commit 051efd9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tools/appliance/systemvmtemplate/scripts/configure_locale.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ set -x
2222
function configure_locale() {
2323
grep LANG=en_US.UTF-8 /etc/default/locale && \
2424
grep LC_ALL=en_US.UTF-8 /etc/default/locale && \
25-
grep "en_US.UTF-8 UTF-8" /etc/locale.gen &&
25+
grep "^en_US.UTF-8 UTF-8" /etc/locale.gen &&
2626
return
2727

2828
cat >> /etc/default/locale << EOF
2929
LANG=en_US.UTF-8
3030
LC_ALL=en_US.UTF-8
3131
EOF
32+
33+
grep "^en_US.UTF-8 UTF-8" /etc/locale.gen || \
3234
cat >> /etc/locale.gen << EOF
3335
en_US.UTF-8 UTF-8
3436
EOF

0 commit comments

Comments
 (0)