dryang / rpms / systemd

Forked from rpms/systemd a year ago
Clone
923a60
From ce82f7886b2326a507d523dcf459be4ab7fd8eb1 Mon Sep 17 00:00:00 2001
923a60
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@endocode.com>
923a60
Date: Tue, 30 Jun 2015 15:08:49 +0200
923a60
Subject: [PATCH] core: handle --log-target=null when calling systemd-shutdown
923a60
923a60
When shutting down, if systemd was started with --log-target=null,
923a60
systemd-shutdown was being called with --log-target=console.
923a60
923a60
(cherry picked from commit 10f00ff17b9c9b55dc77c99797d27cb819fa5fdf)
923a60
923a60
Cherry-picked from: 10f00ff
923a60
Resolves: #1222517
923a60
---
923a60
 src/core/main.c | 4 ++++
923a60
 1 file changed, 4 insertions(+)
923a60
923a60
diff --git a/src/core/main.c b/src/core/main.c
923a60
index fd527d4d63..1c8d67dac2 100644
923a60
--- a/src/core/main.c
923a60
+++ b/src/core/main.c
923a60
@@ -2001,6 +2001,10 @@ finish:
923a60
                         command_line[pos++] = "kmsg";
923a60
                         break;
923a60
 
923a60
+                case LOG_TARGET_NULL:
923a60
+                        command_line[pos++] = "null";
923a60
+                        break;
923a60
+
923a60
                 case LOG_TARGET_CONSOLE:
923a60
                 default:
923a60
                         command_line[pos++] = "console";