diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lvchange.c | 2 | ||||
| -rw-r--r-- | tools/lvm-static.c | 3 | ||||
| -rw-r--r-- | tools/lvm.c | 2 | ||||
| -rw-r--r-- | tools/lvm2cmdline.h | 4 | ||||
| -rw-r--r-- | tools/lvmcmdlib.c | 5 | ||||
| -rw-r--r-- | tools/lvmcmdline.c | 10 | ||||
| -rw-r--r-- | tools/vgchange.c | 2 |
7 files changed, 15 insertions, 13 deletions
diff --git a/tools/lvchange.c b/tools/lvchange.c index 3c2fa19a..66b48745 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -597,7 +597,7 @@ static int lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, } init_dmeventd_monitor(arg_int_value(cmd, monitor_ARG, - (cmd->is_static || arg_count(cmd, ignoremonitoring_ARG)) ? + (is_static() || arg_count(cmd, ignoremonitoring_ARG)) ? DMEVENTD_MONITOR_IGNORE : DEFAULT_DMEVENTD_MONITOR)); /* access permission change */ diff --git a/tools/lvm-static.c b/tools/lvm-static.c index b0c1e12a..822989f9 100644 --- a/tools/lvm-static.c +++ b/tools/lvm-static.c @@ -17,7 +17,8 @@ int main(int argc, char **argv) { - return lvm2_main(argc, argv, 1); + init_is_static(1); + return lvm2_main(argc, argv); } int lvm_shell(struct cmd_context *cmd __attribute((unused)), diff --git a/tools/lvm.c b/tools/lvm.c index 3576515d..e1f7900c 100644 --- a/tools/lvm.c +++ b/tools/lvm.c @@ -18,7 +18,7 @@ int main(int argc, char **argv) { - return lvm2_main(argc, argv, 0); + return lvm2_main(argc, argv); } #ifdef READLINE_SUPPORT diff --git a/tools/lvm2cmdline.h b/tools/lvm2cmdline.h index f1741792..f4855e73 100644 --- a/tools/lvm2cmdline.h +++ b/tools/lvm2cmdline.h @@ -26,12 +26,12 @@ struct cmdline_context { int interactive; }; -int lvm2_main(int argc, char **argv, unsigned is_static); +int lvm2_main(int argc, char **argv); void *cmdlib_lvm2_init(unsigned is_static); void lvm_fin(struct cmd_context *cmd); -struct cmd_context *init_lvm(unsigned is_static); +struct cmd_context *init_lvm(void); void lvm_register_commands(void); int lvm_split(char *str, int *argc, char **argv, int max); int lvm_run_command(struct cmd_context *cmd, int argc, char **argv); diff --git a/tools/lvmcmdlib.c b/tools/lvmcmdlib.c index 6507accd..1a90c927 100644 --- a/tools/lvmcmdlib.c +++ b/tools/lvmcmdlib.c @@ -28,13 +28,14 @@ #include <time.h> #include <sys/resource.h> -void *cmdlib_lvm2_init(unsigned is_static) +void *cmdlib_lvm2_init(unsigned static_compile) { struct cmd_context *cmd; lvm_register_commands(); - if (!(cmd = init_lvm(is_static))) + init_is_static(static_compile); + if (!(cmd = init_lvm())) return NULL; return (void *) cmd; diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 95dcfbeb..f4a19e5f 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1147,13 +1147,13 @@ static void _close_stray_fds(const char *command) parent_cmdline); } -struct cmd_context *init_lvm(unsigned is_static) +struct cmd_context *init_lvm(void) { struct cmd_context *cmd; _cmdline.the_args = &_the_args[0]; - if (!(cmd = create_toolcontext(is_static, 0))) + if (!(cmd = create_toolcontext(0))) return_NULL; return cmd; @@ -1272,7 +1272,7 @@ static void _nonroot_warning(void) log_warn("WARNING: Running as a non-root user. Functionality may be unavailable."); } -int lvm2_main(int argc, char **argv, unsigned is_static) +int lvm2_main(int argc, char **argv) { const char *base; int ret, alias = 0; @@ -1285,7 +1285,7 @@ int lvm2_main(int argc, char **argv, unsigned is_static) _close_stray_fds(base); - if (is_static && strcmp(base, "lvm.static") && + if (is_static() && strcmp(base, "lvm.static") && path_exists(LVM_SHARED_PATH) && !getenv("LVM_DID_EXEC")) { setenv("LVM_DID_EXEC", base, 1); @@ -1293,7 +1293,7 @@ int lvm2_main(int argc, char **argv, unsigned is_static) unsetenv("LVM_DID_EXEC"); } - if (!(cmd = init_lvm(is_static))) + if (!(cmd = init_lvm())) return -1; cmd->argv = argv; diff --git a/tools/vgchange.c b/tools/vgchange.c index f2df8364..f5d01971 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -540,7 +540,7 @@ static int vgchange_single(struct cmd_context *cmd, const char *vg_name, } init_dmeventd_monitor(arg_int_value(cmd, monitor_ARG, - (cmd->is_static || arg_count(cmd, ignoremonitoring_ARG)) ? + (is_static() || arg_count(cmd, ignoremonitoring_ARG)) ? DMEVENTD_MONITOR_IGNORE : DEFAULT_DMEVENTD_MONITOR)); if (arg_count(cmd, available_ARG)) |