From 916cd35a244f9b813be10b902abcd07f740da93f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 18 Dec 2008 14:47:22 +0000 Subject: o new option "--migrate" which adds Xkb information in /etc/sysconfig/keyboard --- NEWS | 2 ++ tools/keyboarddrake | 3 +++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 195c43f..d80db77 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ - keyboarddrake: o do not configure hal directly, but write in /etc/sysconfig/keyboard Xkb information so hal can get them + o new option "--migrate" which adds Xkb information in + /etc/sysconfig/keyboard o correctly handle default XkbModel (so that we do not force pc105 when we should not) diff --git a/tools/keyboarddrake b/tools/keyboarddrake index 5d79ea8..567a221 100755 --- a/tools/keyboarddrake +++ b/tools/keyboarddrake @@ -20,6 +20,9 @@ my $keyboard = keyboard::read_or_default(); if (my ($kb) = grep { !/^-/ } @ARGV) { keyboard::KEYBOARD2text($kb) or die "bad keyboard $kb\n"; $keyboard->{KEYBOARD} = $kb; +} elsif (grep { $_ eq '--migrate' } @ARGV) { + keyboard::write($keyboard); + exit 0; } else { $ugtk2::wm_icon = "/usr/share/mcc/themes/default/keyboard-mdk.png"; $in = 'interactive'->vnew('su'); -- cgit v1.2.1