[systemd-commits] src/core

[Lennart Poettering]

 src/core/shutdown.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a2726e5cedfa5edeabd7e0784be11bc578555ac5
Author: Marius Tessmann <mus.svz at gmail.com>
Date:   Fri Aug 29 17:51:45 2014 +0200

    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

diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index 1e88b05..d361cbe 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -313,7 +313,7 @@ int main(int argc, char *argv[]) {
             access("/run/initramfs/shutdown", X_OK) == 0) {
                 r = switch_root_initramfs();
                 if (r >= 0) {
-                        arguments[0] = (char*) "/shutdown";
+                        argv[0] = (char*) "/shutdown";
 
                         setsid();
                         make_console_stdio();
@@ -321,7 +321,7 @@ int main(int argc, char *argv[]) {
                         log_info("Successfully changed into root pivot.\n"
                                  "Returning to initrd...");
 
-                        execv("/shutdown", arguments);
+                        execv("/shutdown", argv);
                         log_error("Failed to execute shutdown binary: %m");
                 } else
                         log_error("Failed to switch root to \"/run/initramfs\": %s", strerror(-r));