summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/mousedrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-21 00:16:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-21 00:16:04 +0000
commit7e8fa9773839843c9d8def81ec2ef1315115825a (patch)
treeb20f63ae9f67b2d9c7e8aa6a2b86d56e0d953743 /perl-install/standalone/mousedrake
parent54b71cdf438434e4693aa6064596f4fdb4aac59e (diff)
downloaddrakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.tar
drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.gz
drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.bz2
drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.xz
drakx-backup-do-not-use-7e8fa9773839843c9d8def81ec2ef1315115825a.zip
- %modules::conf is no more a global, so many functions need passing $modules_conf
- $modules_conf is a class choosing modules.conf or modprobe.conf (esp. useful after install) (but not working yet!) - modules::load() doesn't use $modules_conf, use modules::load_and_configure() - modules::load() doesn't allow options, use either modules::load_raw() or modules::load_and_configure() - some functions used to want an array ref for modules options and some a string, now every functions use a string - many functions (like modules::get_alias()) are now methods on $modules_conf - some functions in mouse.pm needed a $in where a $do_pkgs is enough - some perl_checker compliance - small fixes
Diffstat (limited to 'perl-install/standalone/mousedrake')
-rwxr-xr-xperl-install/standalone/mousedrake10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 19d104f95..e78ecb2e8 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -13,14 +13,14 @@ use c;
my $in = 'interactive'->vnew('su');
-modules::mergein_conf();
+my $modules_conf = modules::any_conf->read;
begin:
my $mouse = mouse::read();
my %old = %$mouse;
if (!$::noauto) {
- my $probed_mouse = mouse::detect();
+ my $probed_mouse = mouse::detect($modules_conf);
$mouse = $probed_mouse if !$mouse->{XMOUSETYPE} || !$probed_mouse->{unsafe};
}
@@ -29,14 +29,14 @@ if (!$mouse || !$::auto) {
my $test_hbox;
my $name = $in->ask_from_treelistf('mousedrake', N("Please choose your mouse type."), '|',
sub { join '|', map { translate($_) } split '\|', $_[0] },
- [ mouse::fullnames ],
+ [ mouse::fullnames() ],
$mouse->{type} . '|' . $mouse->{name});
$name or $in->exit(0);
my $mouse_chosen = mouse::fullname2mouse($name);
$mouse = $mouse_chosen if !($mouse->{type} eq $mouse_chosen->{type} && $mouse->{name} eq $mouse_chosen->{name});
if ($mouse->{device} eq "usbmouse") {
- modules::load_category('bus/usb') or die 'no usb bus found\n';
+ modules::load_category($modules_conf, 'bus/usb') or die 'no usb bus found\n';
modules::load(qw(hid mousedev usbmouse));
}
@@ -51,7 +51,7 @@ if (!$mouse || !$::auto) {
$test_hbox and $test_hbox->destroy;
}
-mouse::write_conf($in, $mouse, 1);
+mouse::write_conf($in->do_pkgs, $modules_conf, $mouse, 1);
if ($in->isa('interactive::gtk') && mouse::change_mouse_live($mouse, \%old)) {