forked from pool/systemd
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
|
Based on a2726e5cedfa5edeabd7e0784be11bc578555ac5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marius Tessmann <mus.svz@gmail.com>
|
||
|
|
Date: Fri, 29 Aug 2014 17:51:45 +0200
|
||
|
|
Subject: [PATCH] shutdown: pass own argv to /run/initramfs/shutdown
|
||
|
|
|
||
|
|
Since commit b1e90ec515408aec2702522f6f68c4920b56375b systemd passes
|
||
|
|
its log settings to systemd-shutdown via command line parameters.
|
||
|
|
However, systemd-shutdown doesn't pass these parameters to
|
||
|
|
/run/initramfs/shutdown, causing it to fall back to the default log
|
||
|
|
settings.
|
||
|
|
|
||
|
|
This fixes the following bugs about the shutdown not being quiet
|
||
|
|
despite "quiet" being in the kernel parameters:
|
||
|
|
|
||
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=79582
|
||
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=57216
|
||
|
|
---
|
||
|
|
src/core/shutdown.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- src/core/shutdown.c
|
||
|
|
+++ src/core/shutdown.c 2014-10-24 12:32:44.704337960 +0000
|
||
|
|
@@ -377,11 +377,11 @@ int main(int argc, char *argv[]) {
|
||
|
|
|
||
|
|
if (prepare_new_root() >= 0 &&
|
||
|
|
pivot_to_new_root() >= 0) {
|
||
|
|
- arguments[0] = (char*) "/shutdown";
|
||
|
|
+ argv[0] = (char*) "/shutdown";
|
||
|
|
|
||
|
|
log_info("Returning to initrd...");
|
||
|
|
|
||
|
|
- execv("/shutdown", arguments);
|
||
|
|
+ execv("/shutdown", argv);
|
||
|
|
log_error("Failed to execute shutdown binary: %m");
|
||
|
|
}
|
||
|
|
}
|