summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-23 02:16:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-23 02:16:17 +0000
commit815f5aa43dfb687031b7f40f08f497007887c81d (patch)
treef1d37855c87f3447e144e1663ba7fa35f47580af
parent1978e4e6ea2dcfdd6ce9ec5164ac4da4118bd9b0 (diff)
downloaddrakx-815f5aa43dfb687031b7f40f08f497007887c81d.tar
drakx-815f5aa43dfb687031b7f40f08f497007887c81d.tar.gz
drakx-815f5aa43dfb687031b7f40f08f497007887c81d.tar.bz2
drakx-815f5aa43dfb687031b7f40f08f497007887c81d.tar.xz
drakx-815f5aa43dfb687031b7f40f08f497007887c81d.zip
good_default_monitor() should work *nearly* everywhere, so use it for the auto_install fallback
(this is used by mandrakemove)
-rw-r--r--perl-install/Xconfig/monitor.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index af19aa70f..fc07484b4 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -69,7 +69,11 @@ sub configure_auto_install {
my $monitors_db = monitors_db();
foreach my $monitor (@$monitors) {
- configure_automatic($monitor, $monitors_db) or put_in_hash($monitor, { HorizSync => '31.5-35.1', VertRefresh => '50-61' });
+ if (!configure_automatic($monitor, $monitors_db)) {
+ good_default_monitor() =~ /(.*)\|(.*)/ or internal_error("bad good_default_monitor");
+ put_in_hash($monitor, { VendorName => $1, ModelName => $2 });
+ configure_automatic($monitor, $monitors_db) or internal_error("good_default_monitor (" . good_default_monitor() . ") is unknown in MonitorDB");
+ }
}
$raw_X->set_monitors(@$monitors);
$monitors;