[SCM] live-boot branch, debian-next, updated. debian/2.0_a1-1-1-g3bd9927

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3bd99278ac701c44353f967e33e2aa82dfefa9b5
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon May 24 18:39:04 2010 +0200

    Removing locales  bottom script, now handled by live-config.

diff --git a/scripts/live b/scripts/live
index 4169c90..afe0f4b 100755
--- a/scripts/live
+++ b/scripts/live
@@ -59,13 +59,12 @@ Arguments ()
 				NOFASTBOOT="Yes"
 				NOFSTAB="Yes"
 				NOHOSTS="Yes"
-				NOLOCALES="Yes"
 				NONETWORKING="Yes"
 				NOTIMEZONE="Yes"
 				NOXAUTOCONFIG="Yes"
 				NOXAUTOLOGIN="Yes"
 
-				export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NOLOCALES NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
+				export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
 				;;
 
 			access=*)
@@ -213,17 +212,6 @@ Arguments ()
 				export LIVE_MEDIA_TIMEOUT
 				;;
 
-			language=*|debian-installer/language=*)
-				language=${x#debian-installer/language=}
-				locale="$(lang2locale "$language")"
-				set_locale="true"
-				;;
-
-			locale=*|debian-installer/locale=*)
-				LOCALE="${ARGUMENT#*=}"
-				export LOCALE
-				;;
-
 			module=*)
 				MODULE="${ARGUMENT#module=}"
 				export MODULE
@@ -284,11 +272,6 @@ Arguments ()
 				export NOHOSTS
 				;;
 
-			nolocales)
-				NOLOCALES="Yes"
-				export NOLOCALES
-				;;
-
 			nonetworking)
 				NONETWORKING="Yes"
 				export NONETWORKING
diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
deleted file mode 100755
index e53e487..0000000
--- a/scripts/live-bottom/14locales
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-boot header
-
-if [ -n "${NOLOCALES}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Setting up locales"
-
-# Cosmetic line wrapping for output of local-gen
-echo
-
-# live-boot script
-
-if [ -e /root/etc/default/locale ]
-then
-	grep_file=/root/etc/default/locale
-elif [ -e /root/etc/environment ]
-then
-	# Old locales policy
-	grep_file=/root/etc/environment
-fi
-
-if [ -n "${grep_file}" ]
-then
-	# use rootfs configured locale
-	locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
-fi
-
-if [ -n "${LOCALE}" ]
-then
-	locale="${LOCALE}"
-	set_locale="true"
-fi
-
-if [ -z "${locale}" ]
-then
-	# Set a default one
-	locale=en_US.UTF-8
-	set_locale="true"
-fi
-
-if [ "${set_locale}" ]
-then
-	if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$'
-	then
-		# input is like "locale=it", so we will convert and setup also the keyboard if not already set
-		if [ -z "${KBD}" ]
-		then
-			# FIXME: look if this keyb is supported
-			KBD="${locale}"
-			really_export KBD
-		fi
-
-		uploc=$(echo "${locale}" | tr '[a-z]' '[A-Z]')
-		locale="${locale}_${uploc}.UTF-8"
-	fi
-
-	LANG=
-	language="$(echo ${locale} | cut -d. -f1)"
-	eval $(awk '/^'"${locale}"'/ { print "LANG=" $1 " codepage=" $2; exit; }' /root/usr/share/i18n/SUPPORTED)
-
-	if [ -z "${LANG}" ]
-	then
-		# Try and fallback to another codepage for this language.
-		eval $(awk '/^'"${language}"'/ { print "LANG=" $1 " codepage=" $2; exit; }' /root/usr/share/i18n/SUPPORTED)
-
-		if [ -n "${LANG}" ]
-		then
-			log_warning_msg "Choosing locale '${LANG}' as '${locale}' is unsupported."
-		fi
-	fi
-
-	if [ -z "${LANG}" ]
-	then
-		log_warning_msg "Locale '${locale}' is unsupported."
-		codepage="UTF-8"
-		language="en_US"
-		locale="${language}.${codepage}"
-		LANG="${language}.${codepage}"
-	fi
-
-	if [ -d /root/etc/default/kdm.d/ ]
-	then
-		if ! grep -qs "^LANGUAGE" "${LANG}"
-		then
-			printf 'LANGUAGE=%s\n' "${LANG}" >> /root/etc/default/kdm.d/live-autologin
-		fi
-	elif [ -f /root/etc/kde3/kdm/kdmrc ]
-	then
-		sed -i -r -e "s/#Language=.*/Language=${language}/" \
-			/root/etc/kde3/kdm/kdmrc
-	fi
-
-	really_export LANG
-
-	printf 'LANG="%s"\n' "${LANG}" > /root/etc/default/locale
-	printf 'LANG="%s"\n' "${LANG}" > /root/etc/environment
-	printf '%s %s\n' "${LANG}" "${codepage}" > /root/etc/locale.gen
-
-	if [ -z "${SILENT}" ]
-	then
-		chroot /root /usr/sbin/locale-gen
-	else
-		chroot /root /usr/sbin/locale-gen > /dev/null 2>&1
-	fi
-fi
-
-log_end_msg

-- 
live-boot