summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-04-23 12:16:18 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-04-23 12:16:18 +0000
commit8a55ed4f226995b6d51f2f8e4d1b67dd1de3e156 (patch)
tree694e30baf6597cfd7e052d9585ca5af54efe9c9b
parent72353d4effe216b2cd9680c74668bdaac35a64c6 (diff)
downloaddrakx-8a55ed4f226995b6d51f2f8e4d1b67dd1de3e156.tar
drakx-8a55ed4f226995b6d51f2f8e4d1b67dd1de3e156.tar.gz
drakx-8a55ed4f226995b6d51f2f8e4d1b67dd1de3e156.tar.bz2
drakx-8a55ed4f226995b6d51f2f8e4d1b67dd1de3e156.tar.xz
drakx-8a55ed4f226995b6d51f2f8e4d1b67dd1de3e156.zip
do X11 configuration automagically
-rw-r--r--perl-install/harddrake/data.pm2
-rwxr-xr-xperl-install/standalone/service_harddrake3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index a9c723264..eda938d58 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -123,8 +123,10 @@ our @tree =
string => N("Videocard"),
icon => "video.png",
configurator => "$sbindir/XFdrake",
+ configurator_auto => "$sbindir/XFdrake --auto",
detector => sub { f(grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ /DISPLAY_VGA/ } @devices) },
checked_on_boot => 1,
+ automatic => 1,
},
{
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 32704fc24..bc06b1042 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -39,7 +39,8 @@ my $in;
my $splash = -f '/proc/splash';
# For each hw, class, detect device, compare and offer to reconfigure if needed
foreach my $hw_class (@harddrake::data::tree) {
- my ($Ident, $item, $configurator, $detector, $do_it) = @$hw_class{qw(class string configurator detector checked_on_boot)};
+ my ($Ident, $item, $configurator, $detector, $do_it) = @$hw_class{qw(class string configurator_auto detector checked_on_boot)};
+ $configurator ||= $hw_class->{configurator};
next unless $do_it ^ $invert_do_it;
# No detector ? (should never happen but who know ?)