[syslinux:master] keytab-lilo: update to support kbd 2.0.3 format

syslinux-bot for Olivier Brunel jjk at jjacky.com
Wed Mar 2 14:54:02 PST 2016


Commit-ID:  138e850fab106b5235178848b3e0d33e25f4d3a2
Gitweb:     http://www.syslinux.org/commit/138e850fab106b5235178848b3e0d33e25f4d3a2
Author:     Olivier Brunel <jjk at jjacky.com>
AuthorDate: Wed, 2 Mar 2016 17:52:23 -0500
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Wed, 2 Mar 2016 17:52:25 -0500

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 at jjacky.com>

---
 utils/keytab-lilo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/keytab-lilo b/utils/keytab-lilo
index 9e34160..337a869 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*$/;


More information about the Syslinux-commits mailing list