summaryrefslogtreecommitdiffstats
path: root/satellit_installer/includes/20-prerequisites.inc
diff options
context:
space:
mode:
authorChristian Rößler2014-06-30 18:39:56 +0200
committerChristian Rößler2014-06-30 18:39:56 +0200
commit088fd8ff43b2463ea93fa26a37806ae734c592fa (patch)
treedcd697794170e76dd6e6cc5f810cb8905063adbb /satellit_installer/includes/20-prerequisites.inc
parent[SSPS] Renaming of includes (.inc extension obligatory) (diff)
downloadsetup-scripts-088fd8ff43b2463ea93fa26a37806ae734c592fa.tar.gz
setup-scripts-088fd8ff43b2463ea93fa26a37806ae734c592fa.tar.xz
setup-scripts-088fd8ff43b2463ea93fa26a37806ae734c592fa.zip
[SSPS] Some more bigfixes; better output, better checks for dhclient/pump.
Diffstat (limited to 'satellit_installer/includes/20-prerequisites.inc')
-rw-r--r--satellit_installer/includes/20-prerequisites.inc14
1 files changed, 12 insertions, 2 deletions
diff --git a/satellit_installer/includes/20-prerequisites.inc b/satellit_installer/includes/20-prerequisites.inc
index 687b613..85c896d 100644
--- a/satellit_installer/includes/20-prerequisites.inc
+++ b/satellit_installer/includes/20-prerequisites.inc
@@ -7,12 +7,22 @@ prerequisites() {
# Let's look whether an english locale is alread active (we choose en_US.UTF-8)
if [[ $(grep "en_US.UTF-8" /etc/locale.gen|cut -f 1 -d " ") == "#" ]]; then
- echo "# Generating an english locale (UTF-8)..."
+ echo -n "# Generating an english UTF-8 based locale (this may take some time)..."
# Backing up never hurts:
cp -p /etc/locale.gen /etc/locale.gen.orig
# Now patch the localization file:
sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen
- dpkg-reconfigure locales
+ dpkg-reconfigure locales 2>/dev/null 1>&2
+ if [ "$ERR" -ne 0 ]; then
+ echo
+ echo "# WARNING: Could not reconfigure locales. This is annoying, as"
+ echo "# it will yield some mixed languages, perhaps."
+ echo "# Please make sure thy system has an UTF-8 based"
+ echo "# character set."
+ else
+ echo " ok."
+ fi
+
else
echo "# English locale detected; all is well."
fi