diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-21 01:37:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-21 01:37:00 +0000 |
| commit | 4ee1dd30c7c0659858e685ff00f0ead3416baceb (patch) | |
| tree | 60c2bd3a8cd099841566d5765302198470b49d2e | |
| parent | fcf2dda77899ae72517d0d24b911039b96a000b8 (diff) | |
| download | drakx-4ee1dd30c7c0659858e685ff00f0ead3416baceb.tar drakx-4ee1dd30c7c0659858e685ff00f0ead3416baceb.tar.gz drakx-4ee1dd30c7c0659858e685ff00f0ead3416baceb.tar.bz2 drakx-4ee1dd30c7c0659858e685ff00f0ead3416baceb.tar.xz drakx-4ee1dd30c7c0659858e685ff00f0ead3416baceb.zip | |
use do_pkgs_standalone->new instead of class_discard
| -rw-r--r-- | perl-install/harddrake/autoconf.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm index c347955ba..8384cb33b 100644 --- a/perl-install/harddrake/autoconf.pm +++ b/perl-install/harddrake/autoconf.pm @@ -12,8 +12,8 @@ sub xconf { $o->{raw_X} = Xconfig::default::configure(); require Xconfig::main; - require class_discard; - Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {}, { allowFB => 1 }); + require do_pkgs_standalone; + Xconfig::main::configure_everything_auto_install($o->{raw_X}, do_pkgs_standalone->new, {}, { allowFB => 1 }); modules::load_category($modules_conf, 'various/agpgart'); } diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 24c0f47ab..0e4a178e9 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -29,9 +29,9 @@ $curr_kernel =~ s/(^\d+\.\d+).*/$1/; setVarsInSh("$hw_sysconfdir/kernel", { KERNEL => $curr_kernel }); if ($curr_kernel ne $prev_kernel) { log::explanations("Autoconfiguring mouse since we switched between 2.4.x and 2.6.x kernels"); - require class_discard; + require do_pkgs; require mouse; - mouse::write_conf(class_discard->new, $modules_conf, mouse::detect($modules_conf), 1); + mouse::write_conf(do_pkgs_standalone->new, $modules_conf, mouse::detect($modules_conf), 1); } if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) { |