git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Autogen refresh for kernel-insert-inode-locked.m4
[zfs.git]
/
lib
/
libzfs
/
libzfs_util.c
diff --git
a/lib/libzfs/libzfs_util.c
b/lib/libzfs/libzfs_util.c
index
163cd16
..
da1b9bc
100644
(file)
--- a/
lib/libzfs/libzfs_util.c
+++ b/
lib/libzfs/libzfs_util.c
@@
-632,15
+632,19
@@
libzfs_module_loaded(const char *module)
}
int
}
int
-libzfs_run_process(const char *path, char *argv[])
+libzfs_run_process(const char *path, char *argv[]
, int flags
)
{
pid_t pid;
int rc;
pid = vfork();
if (pid == 0) {
{
pid_t pid;
int rc;
pid = vfork();
if (pid == 0) {
- close(1);
- close(2);
+ if (!(flags & STDOUT_VERBOSE))
+ close(STDOUT_FILENO);
+
+ if (!(flags & STDERR_VERBOSE))
+ close(STDERR_FILENO);
+
(void) execvp(path, argv);
_exit(-1);
} else if (pid > 0) {
(void) execvp(path, argv);
_exit(-1);
} else if (pid > 0) {
@@
-665,7
+669,7
@@
libzfs_load_module(const char *module)
if (libzfs_module_loaded(module))
return 0;
if (libzfs_module_loaded(module))
return 0;
- return libzfs_run_process("/sbin/modprobe", argv);
+ return libzfs_run_process("/sbin/modprobe", argv
, 0
);
}
libzfs_handle_t *
}
libzfs_handle_t *