From: Daniel Baumann <daniel@debian.org>
Date: Fri, 11 Sep 2009 13:53:54 +0000 (+0200)
Subject: Including d-i languagelist in initrd in order evaluate l10n settings.
X-Git-Tag: debian/2.0.15-1~281
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=c0b7db3116c699c78c11ff47d240ee126f9dab5f;p=live-boot-grml.git

Including d-i languagelist in initrd in order evaluate l10n settings.
---

diff --git a/hooks/live b/hooks/live
index 4e29226..697efbf 100755
--- a/hooks/live
+++ b/hooks/live
@@ -35,6 +35,9 @@ then
 	cp /etc/live.conf "${DESTDIR}"/etc
 fi
 
+mkdir -p "${DESTDIR}"/usr/share/live-initramfs
+cp /usr/share/live-initramfs/languagelist "${DESTDIR}"/usr/share/live-initramfs
+
 # Directories
 mkdir -p "${DESTDIR}"/lib/live-initramfs
 
diff --git a/scripts/live-functions b/scripts/live-functions
index 8bf9c38..0eac9b4 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -35,7 +35,7 @@ lang2locale() {
 	langpart="${1%%_*}"
 	if [ "$1" != "C" ]; then
 		# Match the language code with 3rd field in languagelist
-		line=$(grep -v "^#" /root/usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
+		line=$(grep -v "^#" /usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
 		if [ -n "$line" ]; then
 			if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
 				# More than one match; try matching the