1 files changed, 14 insertions, 7 deletions
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index 985fecb4e..adf6d9957 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -4,24 +4,31 @@ use common;
 use any;
 
 sub xconf {
-    my ($o) = @_;
+    my ($modules_conf, $o) = @_;
 
     log::l('automatic XFree configuration');
     
     require Xconfig::default;
-    $o->{raw_X} = Xconfig::default::configure(keyboard::read());
+    $o->{raw_X} = Xconfig::default::configure(do_pkgs_standalone->new);
     
     require Xconfig::main;
-    require class_discard;
-    Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {}, { allowFB => 1 });
+    require do_pkgs;
+    Xconfig::main::configure_everything_auto_install($o->{raw_X}, do_pkgs_standalone->new, {}, { allowFB => 1 });
 
-    modules::load_category('various/agpgart'); 
+    modules::load_category($modules_conf, 'various/agpgart'); 
 }
 
 sub network_conf {
-    my ($o) = @_;
+    my ($obj) = @_;
     require network::network;
-    network::network::easy_dhcp($o->{netc}, $o->{intf}) and $o->{netcnx}{type} = 'lan';
+    network::network::easy_dhcp($obj->{modules_conf}, $obj->{netc}, $obj->{intf}) and $obj->{netcnx}{type} = 'lan';
+}
+
+sub mouse_conf {
+    my ($modules_conf) = @_;
+    require do_pkgs;
+    require mouse;
+    mouse::write_conf(do_pkgs_standalone->new, $modules_conf, mouse::detect($modules_conf), 1);
 }
 
 1;