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

grml · Sep 11, 2009 · 3a04d9f · 3a04d9f
1 parent f416732
commit 3a04d9f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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