Blame SOURCES/0005-vddk-Improve-error-message-if-the-proprietary-librar.patch
|
 |
fe7475 |
From a4e54de2e1ddbf7bd52e2b2e9857402ad93d5286 Mon Sep 17 00:00:00 2001
|
|
|
fe7475 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
fe7475 |
Date: Wed, 25 Jul 2018 09:28:04 +0100
|
|
|
fe7475 |
Subject: [PATCH] vddk: Improve error message if the proprietary library cannot
|
|
|
fe7475 |
be found.
|
|
|
fe7475 |
|
|
|
fe7475 |
(cherry picked from commit 94e791f87c6029983befa6199771345fd9cdfcc9)
|
|
|
fe7475 |
---
|
|
|
fe7475 |
plugins/vddk/vddk.c | 8 ++++++--
|
|
|
fe7475 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
fe7475 |
|
|
|
fe7475 |
diff --git a/plugins/vddk/vddk.c b/plugins/vddk/vddk.c
|
|
|
fe7475 |
index e8b1be5..67aaa61 100644
|
|
|
fe7475 |
--- a/plugins/vddk/vddk.c
|
|
|
fe7475 |
+++ b/plugins/vddk/vddk.c
|
|
|
fe7475 |
@@ -142,12 +142,16 @@ error_function (const char *fs, va_list args)
|
|
|
fe7475 |
static void
|
|
|
fe7475 |
vddk_load (void)
|
|
|
fe7475 |
{
|
|
|
fe7475 |
- const char *soname = "libvixDiskLib.so.6";
|
|
|
fe7475 |
+ static const char soname[] = "libvixDiskLib.so.6";
|
|
|
fe7475 |
|
|
|
fe7475 |
/* Load the plugin and set the entry points. */
|
|
|
fe7475 |
dl = dlopen (soname, RTLD_NOW);
|
|
|
fe7475 |
if (dl == NULL) {
|
|
|
fe7475 |
- nbdkit_error ("%s: %s", soname, dlerror ());
|
|
|
fe7475 |
+ nbdkit_error ("%s\n\n"
|
|
|
fe7475 |
+ "If '%s' is located on a non-standard path you may need to\n"
|
|
|
fe7475 |
+ "set $LD_LIBRARY_PATH or edit /etc/ld.so.conf.\n\n"
|
|
|
fe7475 |
+ "See the nbdkit-vddk-plugin(1) man page for details.",
|
|
|
fe7475 |
+ dlerror (), soname);
|
|
|
fe7475 |
exit (EXIT_FAILURE);
|
|
|
fe7475 |
}
|
|
|
fe7475 |
|
|
|
fe7475 |
--
|
|
|
fe7475 |
1.8.3.1
|
|
|
fe7475 |
|