summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-21 11:28:31 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-21 11:28:31 +0000
commite74c160a2fbab366c8caac0af98244b6501dd19c (patch)
tree53680f2d1147391b26baa0394c68bf34c4b1a6b1 /lib/Xconfig
parent395d8e3576a4d4357d456095397074b62434c7df (diff)
downloaddrakx-kbd-mouse-x11-e74c160a2fbab366c8caac0af98244b6501dd19c.tar
drakx-kbd-mouse-x11-e74c160a2fbab366c8caac0af98244b6501dd19c.tar.gz
drakx-kbd-mouse-x11-e74c160a2fbab366c8caac0af98244b6501dd19c.tar.bz2
drakx-kbd-mouse-x11-e74c160a2fbab366c8caac0af98244b6501dd19c.tar.xz
drakx-kbd-mouse-x11-e74c160a2fbab366c8caac0af98244b6501dd19c.zip
unload drivers loaded by monitor-probe-using-X (fix fglrx usage when harddrake probes using X and loads radeon driver)
Diffstat (limited to 'lib/Xconfig')
-rw-r--r--lib/Xconfig/monitor.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index 6d1e851..a05d5ee 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -257,8 +257,12 @@ sub probe_using_X {
$cards[0]{Driver};
} or return;
- my $resolution = run_program::rooted_get_stdout($::prefix, 'monitor-probe-using-X', $card_Driver) or return;
- generic_flat_panel(chomp_($resolution));
+ require modules;
+ my @old_modules = modules::loaded_modules();
+ my $resolution = run_program::rooted_get_stdout($::prefix, 'monitor-probe-using-X', $card_Driver);
+ modules::unload(difference2([ modules::loaded_modules() ], \@old_modules));
+
+ $resolution && generic_flat_panel(chomp_($resolution));
}
sub probe_DMI() {