diff options
| author | Anssi Hannula <anssi@mageia.org> | 2011-04-20 23:05:34 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mageia.org> | 2011-04-20 23:05:34 +0000 |
| commit | e22901a7950425e4b1ccc428ffd8a7f7c7373741 (patch) | |
| tree | 657e06561a8ec7570ce1945361d0b3cbffc7731d | |
| parent | 36d7c7525da3ae1ebf06eb74c791808792389d12 (diff) | |
| download | drakx-kbd-mouse-x11-e22901a7950425e4b1ccc428ffd8a7f7c7373741.tar drakx-kbd-mouse-x11-e22901a7950425e4b1ccc428ffd8a7f7c7373741.tar.gz drakx-kbd-mouse-x11-e22901a7950425e4b1ccc428ffd8a7f7c7373741.tar.bz2 drakx-kbd-mouse-x11-e22901a7950425e4b1ccc428ffd8a7f7c7373741.tar.xz drakx-kbd-mouse-x11-e22901a7950425e4b1ccc428ffd8a7f7c7373741.zip | |
Try unloading unconfigured drivers in "display_driver_helper --check-loaded".
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | tools/display_driver_helper | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -1,5 +1,6 @@ - disable debug output of display_driver_helper by default - fix ahead-of-X-server loading of proprietary and fglrx kernel modules +- try unloading unconfigured drivers in "display_driver_helper --check-loaded" Version 0.93 - 17 April 2011 diff --git a/tools/display_driver_helper b/tools/display_driver_helper index 02dd482..9376d43 100644 --- a/tools/display_driver_helper +++ b/tools/display_driver_helper @@ -122,7 +122,8 @@ check_dkms_status() { # Check if all loaded kernel modules have correct xorg.conf check_loaded() { for module in $(grep -oE "^($KNOWN_MODULES) " /proc/modules); do - check_driver "$module" || return 1 + # try to unload the driver in case it is not in use before bailing + check_driver "$module" || rmmod "$module" &>/dev/null || return 1 done return 0 } |