From ff036a133943d983ac7076b91557119e4949b7f5 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 3 Jun 2005 04:45:04 +0000
Subject: keyboard::setup() is better named keyboard::setup_install()

---
 perl-install/commands.pm      | 2 +-
 perl-install/install_steps.pm | 4 ++--
 perl-install/keyboard.pm      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 14c4786f3..e6e49f5af 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -473,7 +473,7 @@ sub loadkeys {
     $h || @_ != 1 and die "usage: loadkeys <keyboard>\n";
 
     require keyboard;
-    keyboard::setup({ KEYBOARD => $_[0] });
+    keyboard::setup_install({ KEYBOARD => $_[0] });
 }
 
 sub sync() { common::sync() }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 3485c6986..f4b170a93 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -121,7 +121,7 @@ sub selectLanguage {
     if (!$o->{keyboard} || $o->{keyboard}{unsafe}) {
 	$o->{keyboard} = keyboard::default($o->{locale});
 	$o->{keyboard}{unsafe} = 1;
-	keyboard::setup($o->{keyboard});
+	keyboard::setup_install($o->{keyboard});
     }
 
     $o->charsetChanged;
@@ -137,7 +137,7 @@ sub selectLanguage {
 sub selectKeyboard {
     my ($o) = @_;
     $o->{keyboard}{KBCHARSET} = lang::l2charset($o->{locale}{lang});
-    keyboard::setup($o->{keyboard});
+    keyboard::setup_install($o->{keyboard});
 
     addToBeDone {
 	keyboard::write($o->{keyboard});
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index f01433a04..5dfbede1e 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -564,7 +564,7 @@ sub setxkbmap {
     run_program::run('setxkbmap', $xkb->{XkbLayout}, '-model' => $xkb->{XkbModel}, '-option' => $xkb->{XkbOptions} || '', '-compat' => $xkb->{XkbCompat} || '');
 }
 
-sub setup {
+sub setup_install {
     my ($keyboard) = @_;
 
     return if arch() =~ /^sparc/;
-- 
cgit v1.2.1