[Initng-svn] r3711 - initng-ifiles/trunk/initfiles/system

[svn at initng.thinktux.net]

Author: biebl
Date: Thu Apr  6 17:56:44 2006
New Revision: 3711

Modified:
   initng-ifiles/trunk/initfiles/system/console-screen.ii
Log:
Support the new /etc/default/locale file in Debian. 


Modified: initng-ifiles/trunk/initfiles/system/console-screen.ii
==============================================================================
--- initng-ifiles/trunk/initfiles/system/console-screen.ii	(original)
+++ initng-ifiles/trunk/initfiles/system/console-screen.ii	Thu Apr  6 17:56:44 2006
@@ -125,11 +125,15 @@
 
 		# Go to UTF-8 mode as necessary
 		#
-		if [ -f /etc/environment ]
+		# Look for the legacy file first
+		[ -f /etc/environment ] && LOCALE_FILE=/etc/environment
+		# If we have the newer /etc/default/locale file, use that instead
+		[ -f /etc/default/locale ] && LOCALE_FILE=/etc/default/locale
+		if [ ! -z ${LOCALE_FILE} ]
 		then
 			for var in LANG LC_ALL LC_CTYPE
 			do
-				value=`@egrep@ "^[^#]*${var}=" /etc/environment | @tail@ -n1 | @cut@ -d= -f2`
+				value=`@egrep@ "^[^#]*${var}=" ${LOCALE_FILE} | @tail@ -n1 | @cut@ -d= -f2`
 				eval ${var}=${value}
 			done
 		fi