Bug #4361: Change driver probe logic to read the driver list from disk

    instead of using a compile-time array.

1 files changed, 6 insertions, 0 deletions

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 4e5f6dd4a..6f724effe 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -457,6 +457,11 @@ xf86InputDriverlistFromConfig()
 static char **
 GenerateDriverlist(char * dirname, char * drivernames)
 {
+#ifdef XFree86LOADER
+    char *subdirs[] = { dirname, NULL };
+    static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
+    return LoaderListDirs(subdirs, patlist);
+#else /* non-loadable server */
     char *cp, **driverlist;
     int count;
 
@@ -544,6 +549,7 @@ GenerateDriverlist(char * dirname, char * drivernames)
 #endif /* XFree86LOADER */
 
     return driverlist;
+#endif
 }