summaryrefslogtreecommitdiffstats
path: root/sbin/geom/core/geom.c
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2004-08-01 22:24:07 +0000
committerpjd <pjd@FreeBSD.org>2004-08-01 22:24:07 +0000
commit237c75e898625c7229b8d6db9c909d719aea8ef3 (patch)
tree0693b34165ff1c9f70d31ae39190d546ba9042af /sbin/geom/core/geom.c
parentb6d85a7112a38530d6e7f4e50fa29658304e0a68 (diff)
downloadFreeBSD-src-237c75e898625c7229b8d6db9c909d719aea8ef3.zip
FreeBSD-src-237c75e898625c7229b8d6db9c909d719aea8ef3.tar.gz
After changing LIBDIR to SHLIBDIR, because of dependencies problems,
new problem shows up: symblic links (<libname>.so) are created under /usr/lib/ now, instead of under /lib/geom/ where geom(8) looks for them. Introduce a workaround to fix this by teaching geom(8) to open libraries via /lib/geom/<libname>.so.<major_number> instead of /lib/geom/<libname>.so.
Diffstat (limited to 'sbin/geom/core/geom.c')
-rw-r--r--sbin/geom/core/geom.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index 12959a3..dcc6631 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -438,7 +438,8 @@ load_library(void)
uint32_t *lib_version;
void *dlh;
- snprintf(path, sizeof(path), "%s/geom_%s.so", CLASSDIR, class_name);
+ snprintf(path, sizeof(path), "%s/geom_%s.so.%u", CLASS_DIR, class_name,
+ CLASS_MAJOR);
dlh = dlopen(path, RTLD_NOW);
if (dlh == NULL) {
#if 0
OpenPOWER on IntegriCloud