summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2011-05-04 20:14:19 +0000
committerAnssi Hannula <anssi@mageia.org>2011-05-04 20:14:19 +0000
commit12c70393c6ef14f66c9f0d3d930c472f1f195e6a (patch)
tree976f16b2174c75db8b13f8f7665eb33e1d3684bf /lib/Xconfig
parent29ddfae35e834d3658f935bebeb896986a0139ce (diff)
downloaddrakx-kbd-mouse-x11-12c70393c6ef14f66c9f0d3d930c472f1f195e6a.tar
drakx-kbd-mouse-x11-12c70393c6ef14f66c9f0d3d930c472f1f195e6a.tar.gz
drakx-kbd-mouse-x11-12c70393c6ef14f66c9f0d3d930c472f1f195e6a.tar.bz2
drakx-kbd-mouse-x11-12c70393c6ef14f66c9f0d3d930c472f1f195e6a.tar.xz
drakx-kbd-mouse-x11-12c70393c6ef14f66c9f0d3d930c472f1f195e6a.zip
Fallback to X server run-time autodetection on laptops instead of
1024x768 when the monitor could not be probed (Mageia #1059).
Diffstat (limited to 'lib/Xconfig')
-rw-r--r--lib/Xconfig/monitor.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index 0fc2c31..857ac01 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -19,11 +19,12 @@ sub good_default_monitor() {
sub default_monitor {
my ($card_Driver) = @_;
- if (detect_devices::is_virtualbox() || ($card_Driver eq 'siliconmotion' && arch() =~ /mips/)) {
+ if (detect_devices::is_virtualbox() || detect_devices::isLaptop() || ($card_Driver eq 'siliconmotion' && arch() =~ /mips/)) {
# HACK: since there is no way to get the EDID on gdium, the resolution is passed to the kernel
# so we can rely on it
# in vbox, we return Plug'n'Play because the vbox integration addons
# will take care of everything for us
+ # On laptops the X server should usually be able to autodetect everything.
{ VendorName => "Plug'n Play" };
} else {
good_default_monitor() =~ /(.*)\|(.*)/ or internal_error("bad good_default_monitor");