WHATS_NEW | 1 + lib/log/log.c | 3 +++ man/lvm.8_main | 3 +++ scripts/generator-internals.c | 3 +++ 4 files changed, 10 insertions(+) diff --git a/WHATS_NEW b/WHATS_NEW index 4b68dbd..26628c3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.03.03 - ==================================== + Introduce LVM_SUPPRESS_SYSLOG to suppress syslog usage by generator. Fix generator querying config options missing from lvm.conf. Restore missing man info lvcreate --zero for thin-pools. Drop misleadning comment for metadata minimum_io_size for VDO segment. diff --git a/lib/log/log.c b/lib/log/log.c index fd056b1..f6aaa04 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -324,6 +324,9 @@ void init_log_while_suspended(int log_while_suspended) void init_syslog(int facility) { + if (getenv("LVM_SUPPRESS_SYSLOG")) + return; + openlog("lvm", LOG_PID, facility); _syslog = 1; } diff --git a/man/lvm.8_main b/man/lvm.8_main index b9abf58..3e67b1b 100644 --- a/man/lvm.8_main +++ b/man/lvm.8_main @@ -435,6 +435,9 @@ Defaults to "\fI#DEFAULT_SYS_DIR#\fP". .B LVM_SUPPRESS_FD_WARNINGS Suppress warnings about unexpected file descriptors passed into LVM. .TP +.B LVM_SUPPRESS_SYSLOG +Suppress contacting syslog. +.TP .B LVM_VG_NAME The Volume Group name that is assumed for any reference to a Logical Volume that doesn't specify a path. diff --git a/scripts/generator-internals.c b/scripts/generator-internals.c index 7bab4f9..f7e32b0 100644 --- a/scripts/generator-internals.c +++ b/scripts/generator-internals.c @@ -56,6 +56,9 @@ static bool _open_child(struct child_process *child, const char *cmd, const char (void) close(pipe_fd[1]); } + /* Suppressing any use of syslog */ + (void) setenv("LVM_SUPPRESS_SYSLOG", "1", 1); + if (execv(cmd, (char *const *) argv) < 0) _error("execv failed: %s\n", strerror(errno)); // Shouldn't get here unless exec failed.