You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.0 KiB
32 lines
1.0 KiB
7 years ago
|
From ce82f7886b2326a507d523dcf459be4ab7fd8eb1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@endocode.com>
|
||
|
|
Date: Tue, 30 Jun 2015 15:08:49 +0200
|
||
|
|
Subject: [PATCH] core: handle --log-target=null when calling systemd-shutdown
|
||
|
|
|
||
|
|
When shutting down, if systemd was started with --log-target=null,
|
||
|
|
systemd-shutdown was being called with --log-target=console.
|
||
|
|
|
||
|
|
(cherry picked from commit 10f00ff17b9c9b55dc77c99797d27cb819fa5fdf)
|
||
|
|
|
||
|
|
Cherry-picked from: 10f00ff
|
||
|
|
Resolves: #1222517
|
||
|
|
---
|
||
|
|
src/core/main.c | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/core/main.c b/src/core/main.c
|
||
|
|
index fd527d4d6..1c8d67dac 100644
|
||
|
|
--- a/src/core/main.c
|
||
|
|
+++ b/src/core/main.c
|
||
|
|
@@ -2001,6 +2001,10 @@ finish:
|
||
|
|
command_line[pos++] = "kmsg";
|
||
|
|
break;
|
||
|
|
|
||
|
|
+ case LOG_TARGET_NULL:
|
||
|
|
+ command_line[pos++] = "null";
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
case LOG_TARGET_CONSOLE:
|
||
|
|
default:
|
||
|
|
command_line[pos++] = "console";
|