summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-04-14 14:35:42 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-04-14 14:35:42 +0000
commitc391ae79db4a14d6aad5e525192cc52869cd17de (patch)
treebbd7dd437cf39c9474cc4be0f14e65134431f90f /lib
parent755ceb1db2f1b90b8440f445b0c4a774d74f58de (diff)
downloaddrakx-kbd-mouse-x11-c391ae79db4a14d6aad5e525192cc52869cd17de.tar
drakx-kbd-mouse-x11-c391ae79db4a14d6aad5e525192cc52869cd17de.tar.gz
drakx-kbd-mouse-x11-c391ae79db4a14d6aad5e525192cc52869cd17de.tar.bz2
drakx-kbd-mouse-x11-c391ae79db4a14d6aad5e525192cc52869cd17de.tar.xz
drakx-kbd-mouse-x11-c391ae79db4a14d6aad5e525192cc52869cd17de.zip
Use plugnplay monitor for virtual box, fixes #49642. Thanks Titi for the patch!
Diffstat (limited to 'lib')
-rw-r--r--lib/Xconfig/monitor.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index e3fe0ea..cc963c7 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -19,9 +19,11 @@ sub good_default_monitor() {
sub default_monitor {
my ($card_Driver) = @_;
- if ($card_Driver eq 'siliconmotion' && arch() =~ /mips/) {
+ if (detect_devices::is_virtualbox() || ($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
{ VendorName => "Plug'n Play" };
} else {
good_default_monitor() =~ /(.*)\|(.*)/ or internal_error("bad good_default_monitor");