summaryrefslogtreecommitdiffstats
path: root/remote/modules/german
diff options
context:
space:
mode:
authorSimon Rettberg2013-10-04 10:09:19 +0200
committerSimon Rettberg2013-10-04 10:09:19 +0200
commitce44d0f9c26fc51dc96626b40ecf2a33244c183c (patch)
treef62b17d03fc6a79baba24f6bc63bfcb556f711b7 /remote/modules/german
parent[rootfs-stage32] Add dnbd3 support to stage4 mounting (diff)
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-ce44d0f9c26fc51dc96626b40ecf2a33244c183c.tar.gz
tm-scripts-ce44d0f9c26fc51dc96626b40ecf2a33244c183c.tar.xz
tm-scripts-ce44d0f9c26fc51dc96626b40ecf2a33244c183c.zip
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/german')
-rw-r--r--remote/modules/german/german.build6
1 files changed, 3 insertions, 3 deletions
diff --git a/remote/modules/german/german.build b/remote/modules/german/german.build
index c8795254..cd68f009 100644
--- a/remote/modules/german/german.build
+++ b/remote/modules/german/german.build
@@ -10,10 +10,10 @@ build() {
locale-gen || perror "Could not generate locales (debian style)"
fi
# Ubuntu's version
- if [ -d "/var/lib/locales/supported.d" ] && ! grep -q -E -r '^\s*de_DE\.UTF-8' "/var/lib/locales/supported.d"; then
+ if [ -d "/var/lib/locales/supported.d" ] && [ ! -d /usr/lib/locale/de_DE.utf8 ]; then
pinfo "Generating locales..."
- echo 'de_DE.UTF-8 UTF-8' >> "/var/lib/locales/supported.d/openslx"
- locale-gen "de_DE.UTF-8" || perror "Could not generate locales (ubuntu style)"
+ grep -q -E -r '^\s*de_DE\.UTF-8' "/var/lib/locales/supported.d" || echo 'de_DE.UTF-8 UTF-8' >> "/var/lib/locales/supported.d/openslx"
+ locale-gen --no-archive --purge "de_DE.UTF-8" || perror "Could not generate locales (ubuntu style)"
fi
# Put everything we build or get from the system in build dir