From 9ee2f1e2358c86dce0da1a65f2352e8e3cba5ea4 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Tue, 7 Jul 2015 14:29:22 +0200

Subject: [PATCH] TEST-04-FULL-SYSTEMD: fixup loadkeys keymap loading

---

 test/TEST-04-FULL-SYSTEMD/test.sh | 15 ++++++++++-----

 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh

index 1c12e4f..6ea9281 100755

--- a/test/TEST-04-FULL-SYSTEMD/test.sh

+++ b/test/TEST-04-FULL-SYSTEMD/test.sh

@@ -171,13 +171,18 @@ EOF

         inst /usr/lib/systemd/system/dbus.socket

         inst /usr/lib/systemd/system/dbus.service

+        (

+            echo "FONT=latarcyrheb-sun16"

+            echo "KEYMAP=us"

+        ) >$initrd/etc/vconsole.conf

+

         # install basic keyboard maps and fonts

         for i in \

             /usr/lib/kbd/consolefonts/eurlatgr* \

             /usr/lib/kbd/consolefonts/latarcyrheb-sun16* \

-            /usr/lib/kbd/keymaps/include/* \

-            /usr/lib/kbd/keymaps/i386/include/* \

-            /usr/lib/kbd/keymaps/i386/qwerty/us.*; do

+            /usr/lib/kbd/keymaps/{legacy/,/}include/* \

+            /usr/lib/kbd/keymaps/{legacy/,/}i386/include/* \

+            /usr/lib/kbd/keymaps/{legacy/,/}i386/qwerty/us.*; do

                 [[ -f $i ]] || continue

                 inst $i

         done

@@ -260,9 +265,9 @@ EOF

 	inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules

     )

     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \

-	-a "debug systemd" \

+	-a "debug systemd i18n" \

 	-I "/etc/machine-id /etc/hostname" \

-        -o "dash network plymouth lvm mdraid resume crypt i18n caps dm terminfo usrmount kernel-network-modules" \

+        -o "dash network plymouth lvm mdraid resume crypt caps dm terminfo usrmount kernel-network-modules" \

 	-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \

         --no-hostonly-cmdline -N \

 	-f $TESTDIR/initramfs.testing $KVERSION || return 1