diff options
| -rw-r--r-- | rescue/NEWS | 4 | ||||
| -rw-r--r-- | rescue/list.xml | 2 | ||||
| -rwxr-xr-x | rescue/make_rescue_img | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/rescue/NEWS b/rescue/NEWS index ea9eba884..a67614283 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,3 +1,7 @@ +- loadkeys file: + o handle new "kbd" rpm which have .map files instead of .kmap + o don't skip fr_CH-latin1 + o handle "fr_CH"-like short names - remove rescuept (use testdisk instead, which is much nicer) Version 1.5 - 9 July 2007, by Pascal "Pixel" Rigaux diff --git a/rescue/list.xml b/rescue/list.xml index e67d91fdb..29a8ff589 100644 --- a/rescue/list.xml +++ b/rescue/list.xml @@ -129,7 +129,7 @@ /usr/lib/kbd/keymaps/include <if ARCH="i.86|x86_64"> /usr/lib/kbd/keymaps/i386/include - /usr/lib/kbd/keymaps/i386/azerty/be-latin1.kmap.gz <!-- this one is needed by be2-latin1 --> + /usr/lib/kbd/keymaps/i386/azerty/be-latin1.map.gz <!-- this one is needed by be2-latin1 --> </if> /usr/share/misc/file/magic /usr/share/terminfo/l/linux diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 996025373..c35be4399 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -49,16 +49,17 @@ substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue"; _ "../tools/install-xml-file-list list.xml $tmp"; my %keytable_conflicts; -my @less_important_keytables = qw(am_old am_phonetic no-dvorak fr_CH-latin1); +my @less_important_keytables = qw(am_old am_phonetic no-dvorak); foreach (keyboard::loadkeys_files()) { my ($dir, $fname) = (dirname($_), basename($_)); - my ($name) = $fname =~ /(.*)\.kmap\.gz/ or next; + my ($name) = $fname =~ /(.*)\.map\.gz/ or next; next if member($name, @less_important_keytables); - if (my ($short) = $name =~ m|(.+?)[\W_]|) { + if (my ($short2, $short) = $name =~ m|((.+?)[\W_][^\W_]*)|) { + $keytable_conflicts{$short} && $short2 ne $name and $short = $short2; $keytable_conflicts{$short} and warn("conflict between $keytable_conflicts{$short} and $name for short name $short (choosing the first)\n"), next; $keytable_conflicts{$short} = $name; # create the short name based on the long one - symlinkf($fname, "$tmp$dir/$short.kmap.gz"); + symlinkf($fname, "$tmp$dir/$short.map.gz"); } } |