aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Brunel <jjk@jjacky.com>2016-03-02 17:52:23 -0500
committerGene Cumm <gene.cumm@gmail.com>2016-03-02 17:52:25 -0500
commit138e850fab106b5235178848b3e0d33e25f4d3a2 (patch)
tree5aaad397eb8363346cce7693c67ec040d2029409
parentbd91041bff259cf4303fa6bbb0b6bce33fa7c1e8 (diff)
downloadsyslinux-138e850fab106b5235178848b3e0d33e25f4d3a2.tar.gz
syslinux-138e850fab106b5235178848b3e0d33e25f4d3a2.tar.xz
syslinux-138e850fab106b5235178848b3e0d33e25f4d3a2.zip
keytab-lilo: update to support kbd 2.0.3 format
Since kbd 2.0.3 (commit 6ff47cf2) the format generated by 'loadkeys -m' has changed slightly, using "unsigned short" instead of "u_short" Signed-off-by: Olivier Brunel <jjk@jjacky.com>
-rwxr-xr-xutils/keytab-lilo4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/keytab-lilo b/utils/keytab-lilo
index 9e341605..337a8691 100755
--- a/utils/keytab-lilo
+++ b/utils/keytab-lilo
@@ -48,9 +48,9 @@ sub load_map
$empty = 1;
while (<FILE>) {
chop;
- if (/^(static\s+)?u_short\s+(\S+)_map\[\S*\]\s+=\s+{\s*$/) {
+ if (/^(static\s+)?(u_|unsigned )short\s+(\S+)_map\[\S*\]\s+=\s+{\s*$/) {
die "active at beginning of map" if defined $current;
- $current = $pfx.":".$2;
+ $current = $pfx.":".$3;
next;
}
undef $current if /^};\s*$/;