Updating lang2locale(); to match new d-i langualgelist format.
authorDaniel Baumann <daniel@debian.org>
Fri, 11 Sep 2009 14:34:59 +0000 (16:34 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 9 Mar 2011 16:48:06 +0000 (17:48 +0100)
scripts/live-functions

index 0eac9b4..4a23e69 100644 (file)
@@ -35,7 +35,7 @@ lang2locale() {
        langpart="${1%%_*}"
        if [ "$1" != "C" ]; then
                # Match the language code with 3rd field in languagelist
-               line=$(grep -v "^#" /usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
+               line=$(grep -v "^#" /usr/share/live-initramfs/languagelist | cut -f1,3,6 -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