summaryrefslogtreecommitdiff
path: root/scripts/live-functions
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-04-17 03:57:19 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:47:59 +0100
commit47296da8bee39d7cca4f57e572e2fdafe4eb36a5 (patch)
treedc99012518dca6d1e43cc898dafbe7c2483c835e /scripts/live-functions
parent7a40489620ead4392765b3e8ba9a7f2c020676d3 (diff)
downloadlive-boot-47296da8bee39d7cca4f57e572e2fdafe4eb36a5.tar.gz
live-boot-47296da8bee39d7cca4f57e572e2fdafe4eb36a5.zip
Remove bogus dependency on Ubuntu "localechooser-data" package
In Debian, this package doesn't exist as a .deb, so we must maintain our own local copy of the languagelist file. (This patch also adds code to synchronise this file to the Makefile's "update:" target so this isn't too annoying.)
Diffstat (limited to 'scripts/live-functions')
-rw-r--r--scripts/live-functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/live-functions b/scripts/live-functions
index b6d04fb..c5055a0 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -34,7 +34,7 @@ lang2locale() {
langpart="${1%%_*}"
if [ "$1" != "C" ]; then
# Match the language code with 3rd field in languagelist
- line=$(grep -v "^#" /root/usr/share/localechooser/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
+ line=$(grep -v "^#" /root/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