dhcpcd: don't report forked to background in quiet mode

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index e7353d5744685d30c702f9b77371f2014fdd51ea..d8c102bbcde8c028b3bf7b3837bc3d7da9807ff6 100644 (file)
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -347,7 +347,9 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx)
                return;
 
        /* Don't use loginfo because this makes no sense in a log. */
-       fprintf(stderr, "forked to background, child pid %d\n", getpid());
+       if (!(loggetopts() & LOGERR_QUIET))
+               fprintf(stderr, "forked to background, child pid %d\n",
+                   getpid());
        i = EXIT_SUCCESS;
        if (write(ctx->fork_fd, &i, sizeof(i)) == -1)
                logerr("write");

diff --git a/src/logerr.c b/src/logerr.c
index 09ddceec7006480f1f681dbe09d7ddca3bd23499..170b529d37b4f5a8569a4eb04b168a1b18cce733 100644 (file)
--- a/src/logerr.c
+++ b/src/logerr.c
@@ -330,6 +330,14 @@ log_errx(const char *fmt, ...)
        va_end(args);
 }
 
+unsigned int
+loggetopts(void)
+{
+       struct logctx *ctx = &_logctx;
+
+       return ctx->log_opts;
+}
+
 void
 logsetopts(unsigned int opts)
 {

diff --git a/src/logerr.h b/src/logerr.h
index 712f25b11b11b303a11fa040357505a86d76eb2f..4b4d6dc42566418e531b4eceff52594eed5d3e8e 100644 (file)
--- a/src/logerr.h
+++ b/src/logerr.h
@@ -76,6 +76,7 @@ __printflike(2, 3) void logerrmessage(int pri, const char *fmt, ...);
 #define logerr(...)    log_err(__VA_ARGS__)
 #define logerrx(...)   log_errx(__VA_ARGS__)
 
+unsigned int loggetopts(void);
 void logsetopts(unsigned int);
 #define        LOGERR_DEBUG    (1U << 6)
 #define        LOGERR_QUIET    (1U << 7)