summaryrefslogtreecommitdiffstats
path: root/misc-utils/logger.c
diff options
context:
space:
mode:
authorRuediger Meier2015-03-26 14:20:29 +0100
committerRuediger Meier2015-04-09 17:55:17 +0200
commitbcf7e149393ee41af3e092a58dba643c8c091c28 (patch)
treea7295cffba1f6f65b46c4e3283b01c89ac2ad865 /misc-utils/logger.c
parentlibfdisk: recognize FAT32 partitions hidden by Acronis software (diff)
downloadkernel-qcow2-util-linux-bcf7e149393ee41af3e092a58dba643c8c091c28.tar.gz
kernel-qcow2-util-linux-bcf7e149393ee41af3e092a58dba643c8c091c28.tar.xz
kernel-qcow2-util-linux-bcf7e149393ee41af3e092a58dba643c8c091c28.zip
logger: --stderr and --no-act turn "auto-errors" on
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'misc-utils/logger.c')
-rw-r--r--misc-utils/logger.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 6316a76fc..8908dfcc1 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -914,10 +914,9 @@ int main(int argc, char **argv)
ctl.unix_socket_errors = 1;
break;
case AF_UNIX_ERRORS_AUTO:
+ ctl.unix_socket_errors = ctl.noact || ctl.stderr_printout;
#ifdef HAVE_LIBSYSTEMD
- ctl.unix_socket_errors = sd_booted();
-#else
- ctl.unix_socket_errors = 0;
+ ctl.unix_socket_errors |= !!sd_booted();
#endif
break;
default: