diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-21 00:16:04 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-21 00:16:04 +0000 |
commit | 7e8fa9773839843c9d8def81ec2ef1315115825a (patch) | |
tree | b20f63ae9f67b2d9c7e8aa6a2b86d56e0d953743 /perl-install/Xconfig/default.pm | |
parent | 54b71cdf438434e4693aa6064596f4fdb4aac59e (diff) | |
download | drakx-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/Xconfig/default.pm')
-rw-r--r-- | perl-install/Xconfig/default.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm index 9d317fc3a..75947bf11 100644 --- a/perl-install/Xconfig/default.pm +++ b/perl-install/Xconfig/default.pm @@ -10,16 +10,15 @@ use mouse; sub configure { - my ($keyboard, $mouse) = @_; + my ($o_keyboard, $o_mouse) = @_; - $keyboard ||= keyboard::read(); - $mouse ||= do { + my $keyboard = $o_keyboard || keyboard::read(); + my $mouse = $o_mouse || do { my $mouse = mouse::read(); - add2hash($mouse, mouse::detect()) if !$::noauto; + add2hash($mouse, mouse::detect(modules::any_conf->read)) if !$::noauto; $mouse; }; - my $raw_X = Xconfig::xfree->empty_config; $raw_X->add_load_module($_) foreach qw(dbe v4l extmod type1 freetype); |