Created attachment 377262 [details] A patch to iterate all configuration keys, not just the ones that have default Description of the problem: My /etc/sysconfig/keyboard: KEYBOARDTYPE="pc" KEYTABLE="us" MODEL="evdev" LAYOUT="us,cz,ru" VARIANT=",qwerty,winkeys" OPTIONS="grp:switch,grp:alt_shift_toggle,grp_led:scroll" When I restart the HAL daemon, lshal outputs the following: # lshal | sed -n '/input.product.*eyboard/,/input.xkb.options/p' input.product = 'AT Translated Set 2 keyboard' (string) input.x11_driver = 'evdev' (string) input.xkb.layout = 'us,cz,ru' (string) input.xkb.model = 'evdev' (string) input.xkb.options = 'terminate:ctrl_alt_bksp' (string) input.product = 'Dell Dell USB Keyboard' (string) input.x11_driver = 'evdev' (string) input.xkb.layout = 'us,cz,ru' (string) input.xkb.model = 'evdev' (string) input.xkb.options = 'terminate:ctrl_alt_bksp' (string) Notice that xkb.layout gets set, but xkb.options don't (fully, anyway, the terminate option comes from 10-x11-keymap.fdi). fedora-setup-keyboard uses the "keytable" key to determine default options. For my value, "us", the default is (from keyboards.h): g_hash_table_insert(kbd_models, "us", "us pc105+inet"); ... meaning defaults are layout=us, model=pc105+inet. My setting of layout override these defaults, which is fine. The problem is, fedora-setup-keyboard doesn't process any settings beyond these two. Version-Release number of selected component (if applicable): fedora-setup-keyboard-0.4-3.fc12.x86_64 How reproducible: Always. Actually I believe this was present on F 11 too. Steps to reproduce: 1. Adjust /etc/sysconfig/keyboard 2. service haldaemon restart 3. Use lshal to see that only some settings take effect Additional info: The problem that I really try to solve is that when the computer wakes up from suspend, keyboard layout settings get lost. This has been the case since upgrade to F 11, F 10 worked fine in this regard.
Created attachment 377265 [details] A patch to iterate all configuration keys, not just the ones that have default My earlier patch leaks a key. This one fixes the problem.
lshal output with the patch applied: # lshal | sed -n '/input.product.*eyboard/,/input.xkb.options/p' input.product = 'AT Translated Set 2 keyboard' (string) input.x11_driver = 'evdev' (string) input.xkb.layout = 'us,cz,ru' (string) input.xkb.model = 'evdev' (string) input.xkb.options = 'terminate:ctrl_alt_bksp,grp:switch,grp:alt_shift_toggle,grp_led:scroll' (string) input.product = 'Dell Dell USB Keyboard' (string) input.x11_driver = 'evdev' (string) input.xkb.layout = 'us,cz,ru' (string) input.xkb.model = 'evdev' (string) input.xkb.options = 'terminate:ctrl_alt_bksp,grp:switch,grp:alt_shift_toggle,grp_led:scroll' (string)
Reviewed-by: Peter Hutterer <peter.hutterer> Adel, can you merge this upstream and put out a new version please? changing version to 12, pretty sure Petr didn't intend to file against F9 :)
(In reply to comment #3) > Reviewed-by: Peter Hutterer <peter.hutterer> > > Adel, can you merge this upstream and put out a new version please? > > > changing version to 12, pretty sure Petr didn't intend to file against F9 :) Sure, thanks for the patch Petr, and Peter for the review, Will apply it today evening and spin a new package.
(In reply to comment #4) > (In reply to comment #3) > > Reviewed-by: Peter Hutterer <peter.hutterer> > > > > Adel, can you merge this upstream and put out a new version please? > > > > > > changing version to 12, pretty sure Petr didn't intend to file against F9 :) > > Sure, thanks for the patch Petr, and Peter for the review, > > Will apply it today evening and spin a new package. Wrong account, above still applies though ;)
fedora-setup-keyboard-0.6-1.fc12 has been submitted as an update for Fedora 12. http://admin.fedoraproject.org/updates/fedora-setup-keyboard-0.6-1.fc12
fedora-setup-keyboard-0.6-1.fc11 has been submitted as an update for Fedora 11. http://admin.fedoraproject.org/updates/fedora-setup-keyboard-0.6-1.fc11
fedora-setup-keyboard-0.6-1.fc12 has been pushed to the Fedora 12 testing repository. If problems still persist, please make note of it in this bug report. If you want to test the update, you can install it with su -c 'yum --enablerepo=updates-testing update fedora-setup-keyboard'. You can provide feedback for this update here: http://admin.fedoraproject.org/updates/F12/FEDORA-2009-13742
fedora-setup-keyboard-0.6-1.fc11 has been pushed to the Fedora 11 testing repository. If problems still persist, please make note of it in this bug report. If you want to test the update, you can install it with su -c 'yum --enablerepo=updates-testing update fedora-setup-keyboard'. You can provide feedback for this update here: http://admin.fedoraproject.org/updates/F11/FEDORA-2009-13745
fedora-setup-keyboard-0.6-1.fc12 has been pushed to the Fedora 12 stable repository. If problems still persist, please make note of it in this bug report.
fedora-setup-keyboard-0.6-1.fc11 has been pushed to the Fedora 11 stable repository. If problems still persist, please make note of it in this bug report.