Changeset 5546 in vbox

Timestamp:

Oct 29, 2007 11:16:02 AM (17 years ago)

Author:

vboxsync

Message:

Host DVD (Linux hosts): load libhal using the correct name

Location:

trunk/src/VBox/Main

Files:

• include/vbox-libhal.h (modified) (1 diff)
• linux/vbox-libhal.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/vbox-libhal.h

@@ -22 +22 @@
 #include <stdint.h>
 
-#define LIB_DBUS "libdbus-1"
-#define LIB_HAL "libhal"
+#define LIB_HAL "libhal.so.1"
 
 /** Types from the dbus and hal header files which we need.  These are taken more or less

trunk/src/VBox/Main/linux/vbox-libhal.cpp

@@ -29 +29 @@
 static bool gCheckedForLibHal = false;
 /**
- * Pointer to the libdbus shared object.  This should only be set once all needed libraries
- * and symbols have been successfully loaded.
- */
-static RTLDRMOD ghLibDBus = 0;
-/**
  * Pointer to the libhal shared object.  This should only be set once all needed libraries
  * and symbols have been successfully loaded.
@@ -57 +52 @@
 bool gLibHalCheckPresence(void)
 {
-    RTLDRMOD hLibDBus;
     RTLDRMOD hLibHal;
 
-    if (ghLibDBus != 0 && ghLibHal != 0 && gCheckedForLibHal == true)
+    if (ghLibHal != 0 && gCheckedForLibHal == true)
         return true;
     if (gCheckedForLibHal == true)
         return false;
-    if (!RT_SUCCESS(RTLdrLoad(LIB_DBUS, &hLibDBus)))
-        return false;
     if (!RT_SUCCESS(RTLdrLoad(LIB_HAL, &hLibHal)))
     {
-        RTLdrClose(hLibDBus);
         return false;
     }
-    if (   RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_error_init", (void **) &gDBusErrorInit))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_get", (void **) &gDBusBusGet))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_error_free", (void **) &gDBusErrorFree))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_unref",
+    if (   RT_SUCCESS(RTLdrGetSymbol(hLibHal, "dbus_error_init", (void **) &gDBusErrorInit))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "dbus_bus_get", (void **) &gDBusBusGet))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "dbus_error_free", (void **) &gDBusErrorFree))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "dbus_connection_unref",
                                      (void **) &gDBusConnectionUnref))
         && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_ctx_new", (void **) &gLibHalCtxNew))
@@ -91 +82 @@
        )
     {
-        ghLibDBus = hLibDBus;
         ghLibHal = hLibHal;
         gCheckedForLibHal = true;
@@ -98 +88 @@
     else
     {
-        RTLdrClose(hLibDBus);
         RTLdrClose(hLibHal);
         gCheckedForLibHal = true;