Set keyboard map on logon screen

edit

I have both fr and eng keyboard maps added in the keyboard settings. My default one is fr.

When I boot up, the logon screen shows, as expected, fr on the top right corner. But even though it shows fr, the eng keyboard map is in use when I type in my password.

This behaviour only shows up when booting up, not when logging on back from suspended.

How do I force the right keyboard layout when I boot up?

(Reproduced the same issue on my laptop)

$ uname -a

Linux michome-fedora 4.16.5-300.fc28.x8664 #1 SMP Fri Apr 27 17:38:36 UTC 2018 x8664 x8664 x8664 GNU/Linux

Edit later : This bug has been fixed in the last update.