diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-09-11 15:53:54 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:06 +0100 |
| commit | c0b7db3116c699c78c11ff47d240ee126f9dab5f (patch) | |
| tree | 05d3f4c2daafe2a4d44e827f045af16d6d5e6a49 | |
| parent | c49970ac71d52bac0d759b1f90c14906c3c503a4 (diff) | |
| download | live-boot-c0b7db3116c699c78c11ff47d240ee126f9dab5f.tar.gz live-boot-c0b7db3116c699c78c11ff47d240ee126f9dab5f.zip | |
Including d-i languagelist in initrd in order evaluate l10n settings.
| -rwxr-xr-x | hooks/live | 3 | ||||
| -rw-r--r-- | scripts/live-functions | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 |