TEST-04-FULL-SYSTEMD: fixup loadkeys keymap loading

master
Harald Hoyer 2015-07-07 14:29:22 +02:00
parent e860ef0e30
commit 9ee2f1e235
1 changed files with 10 additions and 5 deletions

View File

@ -171,13 +171,18 @@ EOF
inst /usr/lib/systemd/system/dbus.socket inst /usr/lib/systemd/system/dbus.socket
inst /usr/lib/systemd/system/dbus.service inst /usr/lib/systemd/system/dbus.service


(
echo "FONT=latarcyrheb-sun16"
echo "KEYMAP=us"
) >$initrd/etc/vconsole.conf

# install basic keyboard maps and fonts # install basic keyboard maps and fonts
for i in \ for i in \
/usr/lib/kbd/consolefonts/eurlatgr* \ /usr/lib/kbd/consolefonts/eurlatgr* \
/usr/lib/kbd/consolefonts/latarcyrheb-sun16* \ /usr/lib/kbd/consolefonts/latarcyrheb-sun16* \
/usr/lib/kbd/keymaps/include/* \ /usr/lib/kbd/keymaps/{legacy/,/}include/* \
/usr/lib/kbd/keymaps/i386/include/* \ /usr/lib/kbd/keymaps/{legacy/,/}i386/include/* \
/usr/lib/kbd/keymaps/i386/qwerty/us.*; do /usr/lib/kbd/keymaps/{legacy/,/}i386/qwerty/us.*; do
[[ -f $i ]] || continue [[ -f $i ]] || continue
inst $i inst $i
done done
@ -260,9 +265,9 @@ EOF
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
) )
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-a "debug systemd" \ -a "debug systemd i18n" \
-I "/etc/machine-id /etc/hostname" \ -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" \ -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
--no-hostonly-cmdline -N \ --no-hostonly-cmdline -N \
-f $TESTDIR/initramfs.testing $KVERSION || return 1 -f $TESTDIR/initramfs.testing $KVERSION || return 1