d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add GEOM_LIBRARY_PATH environment variable which allows to specify an

Browse Source 
alternative to /lib/geom/ path where shared libraries are stored.
- Improve debugging.

MFC after:	3 days
This commit is contained in:
Pawel Jakub Dawidek 2005-02-27 21:14:58 +00:00
parent 8291294024
commit 3bad06e9ba
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=142691
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/geom/core/geom.8
View File

@ -96,6 +96,14 @@ SHSEC
.It
STRIPE
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
.Nm :
.Bl -tag -width ".Ev GEOM_LIBRARY_PATH"
.It Ev GEOM_LIBRARY_PATH
Specifies the path where shared libraries are stored instead of
.Pa /lib/geom/ .
.El
.Sh EXIT STATUS
Exit status is 0 on success, and 1 if the command fails.
.Sh EXAMPLES

22
sbin/geom/core/geom.c
View File

@ -446,6 +446,17 @@ run_command(int argc, char *argv[])
exit(EXIT_SUCCESS);
}
static const char *
library_path(void)
{
const char *path;
path = getenv("GEOM_LIBRARY_PATH");
if (path == NULL)
path = CLASS_DIR;
return (path);
}
static void
load_library(void)
{
@ -453,7 +464,8 @@ load_library(void)
uint32_t *lib_version;
void *dlh;
snprintf(path, sizeof(path), "%s/geom_%s.so", CLASS_DIR, class_name);
snprintf(path, sizeof(path), "%s/geom_%s.so", library_path(),
class_name);
dlh = dlopen(path, RTLD_NOW);
if (dlh == NULL) {
#if 0
@ -670,8 +682,10 @@ std_list_available(void)
int error;
error = geom_gettree(&mesh);
if (error != 0)
if (error != 0) {
fprintf(stderr, "Cannot get GEOM tree: %s.\n", strerror(error));
exit(EXIT_FAILURE);
}
classp = find_class(&mesh, gclass_name);
geom_deletetree(&mesh);
if (classp != NULL)
@ -688,8 +702,10 @@ std_list(struct gctl_req *req, unsigned flags __unused)
int error, *nargs;
error = geom_gettree(&mesh);
if (error != 0)
if (error != 0) {
fprintf(stderr, "Cannot get GEOM tree: %s.\n", strerror(error));
exit(EXIT_FAILURE);
}
classp = find_class(&mesh, gclass_name);
if (classp == NULL) {
geom_deletetree(&mesh);