diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2017-03-07 17:15:58 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2017-03-07 20:25:08 +0100 |
| commit | e2990244437375a022f4da40f633d150de63de8c (patch) | |
| tree | 0cd1da296c6c900f9d64f1aaed7687a2485542bf | |
| parent | 1a441f268a8f2c39460e659b3fdba81577431722 (diff) | |
| download | drakx-kbd-mouse-x11-e2990244437375a022f4da40f633d150de63de8c.tar drakx-kbd-mouse-x11-e2990244437375a022f4da40f633d150de63de8c.tar.gz drakx-kbd-mouse-x11-e2990244437375a022f4da40f633d150de63de8c.tar.bz2 drakx-kbd-mouse-x11-e2990244437375a022f4da40f633d150de63de8c.tar.xz drakx-kbd-mouse-x11-e2990244437375a022f4da40f633d150de63de8c.zip | |
Revert "switch from legacy (KOI8-R) 'ru4' keyboard to 'ru'"
This reverts commit 44a643f73fbb9a1d83fea952326f26fedc407842.
This causes a crash in installer (mga#19680)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/keyboard.pm | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,6 +1,8 @@ - display_driver_helper: o prevent dkms autoload of display driver on Live system before xorg.conf exists (mga#19520) +- keyboarddrake: + o revert switch from legacy (KOI8-R) 'ru4' keyboard to 'ru' - XFdrake: o forbid 24bit for geode (mga#19927) diff --git a/lib/keyboard.pm b/lib/keyboard.pm index dffc396..56cb6e9 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -272,7 +272,7 @@ my %keyboards = ( "ro_qwertz" => [ N_("_: keyboard\nRomanian (qwertz)"), "ro2", "ro", "winkeys", 0 ], "ro" => [ N_("_: keyboard\nRomanian (qwerty)"), "ro", "ro", "std_cedilla", 0 ], "ro_basic" => [ N_("_: keyboard\nRomanian (basic)"), "ro", "ro", "basic", 0 ], - "ru" => [ N_("_: keyboard\nRussian"), "ru", "ru", "", 1 ], + "ru" => [ N_("_: keyboard\nRussian"), "ru4", "ru", "", 1 ], "ru_yawerty" => [ N_("_: keyboard\nRussian (phonetic)"), "ru-yawerty", "ru", "phonetic", 1 ], "se" => [ N_("_: keyboard\nSwedish"), "se-latin1", "se", "", 0 ], "si" => [ N_("_: keyboard\nSlovenian"), "slovene", "si", "", 0 ], @@ -300,7 +300,7 @@ my %keyboards = ( "tifinagh" => [ N_("_: keyboard\nTifinagh (moroccan layout) (+latin/arabic)"), "fr-tifinagh", "fr,ma,ara", ",tifinagh,azerty", 1 ], "tifinagh_p" => [ N_("_: keyboard\nTifinagh (phonetic) (+latin/arabic)"), "fr-tifinaghp", "fr,ma,ara", ",tifinagh-phonetic,azerty", 1 ], # TODO: console map - "tj" => [ N_("_: keyboard\nTajik"), "ru", "tj", "", 1 ], + "tj" => [ N_("_: keyboard\nTajik"), "ru4", "tj", "", 1 ], # TODO: console map "tm" => [ N_("_: keyboard\nTurkmen"), "us", "tm", "", 0 ], "tr_f" => [ N_("_: keyboard\nTurkish (\"F\" model)"), "trf", "tr", "f", 0 ], |