summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-12 17:56:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-12 17:56:30 +0000
commit76e1db70d4cffe9833f23855b7301bec68bcefdb (patch)
treeedc2931b632318ebb429fab9d2b1b87325d80b23
parent00701dbfc0ba81ef465015e11e48d9ca21394562 (diff)
downloaddrakx-backup-do-not-use-76e1db70d4cffe9833f23855b7301bec68bcefdb.tar
drakx-backup-do-not-use-76e1db70d4cffe9833f23855b7301bec68bcefdb.tar.gz
drakx-backup-do-not-use-76e1db70d4cffe9833f23855b7301bec68bcefdb.tar.bz2
drakx-backup-do-not-use-76e1db70d4cffe9833f23855b7301bec68bcefdb.tar.xz
drakx-backup-do-not-use-76e1db70d4cffe9833f23855b7301bec68bcefdb.zip
use $::prefix
-rw-r--r--perl-install/Xconfig/default.pm4
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/mouse.pm3
3 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm
index b9072140e..2293f6a8b 100644
--- a/perl-install/Xconfig/default.pm
+++ b/perl-install/Xconfig/default.pm
@@ -12,9 +12,9 @@ use mouse;
sub configure {
my ($keyboard, $mouse) = @_;
- $keyboard ||= keyboard::read($::prefix);
+ $keyboard ||= keyboard::read();
$mouse ||= do {
- my $mouse = mouse::read($::prefix);
+ my $mouse = mouse::read();
add2hash($mouse, mouse::detect()) if !$::noauto;
$mouse;
};
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index c4305b0aa..842c57fee 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -121,7 +121,7 @@ sub selectKeyboard {
my ($clicked, $first_time, $auto) = ($_[0], $_[1] == 1, $_[2]);
if ($o->{isUpgrade} && $first_time && $o->{keyboard}{unsafe}) {
- if (my $keyboard = keyboard::read($o->{prefix})) {
+ if (my $keyboard = keyboard::read()) {
$o->{keyboard} = $keyboard;
}
}
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 88c807e6e..07a92940e 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -189,8 +189,7 @@ sub serial_port2text {
}
sub read {
- my ($prefix) = @_;
- my %mouse = getVarsFromSh "$prefix/etc/sysconfig/mouse";
+ my %mouse = getVarsFromSh "$::prefix/etc/sysconfig/mouse";
eval { add2hash_(\%mouse, fullname2mouse($mouse{FULLNAME})) };
$mouse{nbuttons} = $mouse{XEMU3} eq "yes" ? 2 : $mouse{WHEEL} eq "yes" ? 5 : 3;
\%mouse;