From 973ae36df96d2ec5e8dc599ef1ec83a123f567e8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Fri, 18 Jun 2004 04:26:54 +0000
Subject: merge x11 autoconf support from MDK-10-branch

---
 perl-install/harddrake/autoconf.pm        | 27 +++++++++++++++++++++++++++
 perl-install/standalone/service_harddrake |  4 ++++
 2 files changed, 31 insertions(+)
 create mode 100644 perl-install/harddrake/autoconf.pm

diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
new file mode 100644
index 000000000..985fecb4e
--- /dev/null
+++ b/perl-install/harddrake/autoconf.pm
@@ -0,0 +1,27 @@
+package harddrake::autoconf;
+
+use common;
+use any;
+
+sub xconf {
+    my ($o) = @_;
+
+    log::l('automatic XFree configuration');
+    
+    require Xconfig::default;
+    $o->{raw_X} = Xconfig::default::configure(keyboard::read());
+    
+    require Xconfig::main;
+    require class_discard;
+    Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {}, { allowFB => 1 });
+
+    modules::load_category('various/agpgart'); 
+}
+
+sub network_conf {
+    my ($o) = @_;
+    require network::network;
+    network::network::easy_dhcp($o->{netc}, $o->{intf}) and $o->{netcnx}{type} = 'lan';
+}
+
+1;
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 2f5a4eb4b..dad428021 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -96,6 +96,10 @@ foreach my $hw_class (@harddrake::data::tree) {
     } elsif ($Ident eq "AGP") {
         # add agpgart modules to modprobe.preload if needed:
         modules::write_conf();
+    } elsif ($Ident eq "VIDEO") {
+        require harddrake::autoconf;
+        harddrake::autoconf::xconf();
+        undef @configurator_pool;
     }
 
     next unless -x first(split /\s+/, $configurator_pool[0]);
-- 
cgit v1.2.1