[SCM] live-config branch, debian, updated. debian/3.0_a23-1-8-g345dbf9
Daniel Baumann
daniel at debian.org
Thu Aug 4 19:25:26 UTC 2011
The following commit has been merged in the debian branch:
commit 6710f35bb828a8eb820c66f90f002bdf8061cd5f
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 13 23:43:37 2011 +0200
Only updating /etc/locale.gen in locales script if existing, thanks to Reinhard Tartler <siretart at tauware.de>.
diff --git a/scripts/config/004-locales b/scripts/config/004-locales
index 32a3570..cdbb544 100755
--- a/scripts/config/004-locales
+++ b/scripts/config/004-locales
@@ -99,7 +99,11 @@ Configure_locales ()
fi
printf 'LANG="%s"\n' "${LANG}" > /etc/default/locale
- sed -i -e "s|# ${LANG} ${_CODEPAGE}|${LANG} ${_CODEPAGE}|" /etc/locale.gen
+
+ if [ -e /etc/locale.gen ]
+ then
+ sed -i -e "s|# ${LANG} ${_CODEPAGE}|${LANG} ${_CODEPAGE}|" /etc/locale.gen
+ fi
locale-gen --keep-existing > /dev/null 2>&1
--
live-config
More information about the debian-live-changes
mailing list