- create keyboard::default() and use it

- it uses keyboard::from_DMI() to get XkbModel when possible

1 files changed, 13 insertions, 0 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 5332a62fa..ee95f8e8c 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -456,6 +456,14 @@ sub lang2keyboard {
     { KEYBOARD => $keyboards{$kb} ? $kb : 'us' }; #- handle incorrect keyboard mapping to us.
 }
 
+sub default {
+    my ($o_locale) = @_;
+
+    my $keyboard = from_usb() || lang2keyboard(($o_locale || lang::read())->{lang});
+    add2hash($keyboard, from_DMI());
+    $keyboard;
+}
+
 sub from_usb() {
     return if $::noauto;
     my ($usb_kbd) = detect_devices::usbKeyboards() or return;
@@ -464,6 +472,11 @@ sub from_usb() {
     $keyboard !~ /SKIP/ && { KEYBOARD => $keyboard };
 }
 
+sub from_DMI() {
+    my $XkbModel = detect_devices::probe_unique_name('XkbModel');
+    $XkbModel && { XkbModel => $XkbModel };
+}
+
 sub load {
     my ($keymap) = @_;
     return if $::testing;