diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-06-23 02:19:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-06-23 02:19:21 +0000 |
| commit | 5a4e6d315a7eaa1bbbc6010bb8161e8f6b08b150 (patch) | |
| tree | 83cee2352bf0322492e40c0910dba3540434cf19 /perl-install/Xconfig | |
| parent | 0bad6a093e3a35d797e4204fc50f17155dcc6159 (diff) | |
| download | drakx-backup-do-not-use-5a4e6d315a7eaa1bbbc6010bb8161e8f6b08b150.tar drakx-backup-do-not-use-5a4e6d315a7eaa1bbbc6010bb8161e8f6b08b150.tar.gz drakx-backup-do-not-use-5a4e6d315a7eaa1bbbc6010bb8161e8f6b08b150.tar.bz2 drakx-backup-do-not-use-5a4e6d315a7eaa1bbbc6010bb8161e8f6b08b150.tar.xz drakx-backup-do-not-use-5a4e6d315a7eaa1bbbc6010bb8161e8f6b08b150.zip | |
good_default_monitor() should work *nearly* everywhere, so use it for the auto_install fallback
(this is used by mandrakemove)
Diffstat (limited to 'perl-install/Xconfig')
| -rw-r--r-- | perl-install/Xconfig/monitor.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm index 38fa8b3d9..00e8271c8 100644 --- a/perl-install/Xconfig/monitor.pm +++ b/perl-install/Xconfig/monitor.pm @@ -64,7 +64,11 @@ sub configure_auto_install { put_in_hash($monitor, $old_monitor); my $monitors = monitors(); - configure_automatic($monitor, $monitors) or put_in_hash($monitor, { HorizSync => '31.5-35.1', VertRefresh => '50-61' }); + if (!configure_automatic($monitor, $monitors)) { + good_default_monitor() =~ /(.*)\|(.*)/ or internal_error("bad good_default_monitor"); + put_in_hash($monitor, { VendorName => $1, ModelName => $2 }); + configure_automatic($monitor, $monitors) or internal_error("good_default_monitor (" . good_default_monitor() . ") is unknown in MonitorDB"); + } $raw_X->set_monitors($monitor); $monitor; } |