summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-06-18 04:26:54 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-06-18 04:26:54 +0000
commit973ae36df96d2ec5e8dc599ef1ec83a123f567e8 (patch)
tree8b04f498534adb329fb35e832aa523be973f2e63 /perl-install
parent1e981e770b74cadcf5926dedad37f69b45b097ab (diff)
downloaddrakx-973ae36df96d2ec5e8dc599ef1ec83a123f567e8.tar
drakx-973ae36df96d2ec5e8dc599ef1ec83a123f567e8.tar.gz
drakx-973ae36df96d2ec5e8dc599ef1ec83a123f567e8.tar.bz2
drakx-973ae36df96d2ec5e8dc599ef1ec83a123f567e8.tar.xz
drakx-973ae36df96d2ec5e8dc599ef1ec83a123f567e8.zip
merge x11 autoconf support from MDK-10-branch
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/harddrake/autoconf.pm27
-rwxr-xr-xperl-install/standalone/service_harddrake4
2 files changed, 31 insertions, 0 deletions
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]);