diff options
Diffstat (limited to 'lib/misc')
-rw-r--r-- | lib/misc/lvm-globals.c | 11 | ||||
-rw-r--r-- | lib/misc/lvm-globals.h | 2 | ||||
-rw-r--r-- | lib/misc/sharedlib.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/lib/misc/lvm-globals.c b/lib/misc/lvm-globals.c index 45114c8e..870b2d7c 100644 --- a/lib/misc/lvm-globals.c +++ b/lib/misc/lvm-globals.c @@ -38,6 +38,7 @@ static int _mirror_in_sync = 0; static int _dmeventd_monitor = DEFAULT_DMEVENTD_MONITOR; static int _ignore_suspended_devices = 0; static int _error_message_produced = 0; +static unsigned _is_static = 0; void init_verbose(int level) { @@ -106,6 +107,11 @@ void init_cmd_name(int status) _log_cmd_name = status; } +void init_is_static(unsigned value) +{ + _is_static = value; +} + void set_cmd_name(const char *cmd) { strncpy(_cmd_name, cmd, sizeof(_cmd_name)); @@ -199,3 +205,8 @@ int debug_level() { return _debug_level; } + +unsigned is_static(void) +{ + return _is_static; +} diff --git a/lib/misc/lvm-globals.h b/lib/misc/lvm-globals.h index 8c354f5d..8209b3ec 100644 --- a/lib/misc/lvm-globals.h +++ b/lib/misc/lvm-globals.h @@ -34,6 +34,7 @@ void init_mirror_in_sync(int in_sync); void init_dmeventd_monitor(int reg); void init_ignore_suspended_devices(int ignore); void init_error_message_produced(int produced); +void init_is_static(unsigned value); void set_cmd_name(const char *cmd_name); @@ -50,6 +51,7 @@ int security_level(void); int mirror_in_sync(void); int ignore_suspended_devices(void); const char *log_command_name(void); +unsigned is_static(void); #define DMEVENTD_MONITOR_IGNORE -1 int dmeventd_monitor_mode(void); diff --git a/lib/misc/sharedlib.c b/lib/misc/sharedlib.c index 7622e47d..cab2909e 100644 --- a/lib/misc/sharedlib.c +++ b/lib/misc/sharedlib.c @@ -44,7 +44,7 @@ void *load_shared_library(struct cmd_context *cmd, const char *libname, char path[PATH_MAX]; void *library; - if (cmd->is_static) { + if (is_static()) { log_error("Not loading shared %s library %s in static mode.", desc, libname); return NULL; |