[systemd-commits] src/core

Lennart Poettering lennart at kemper.freedesktop.org
Thu Nov 21 12:36:19 PST 2013


 src/core/dbus-manager.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 92b315dfb482626ca6c98b67cd862e4af483a499
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 21 21:36:04 2013 +0100

    core: actually make SwitchRoot() bus call do the deed

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 6002d02..c560cac 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1121,7 +1121,7 @@ static int method_switch_root(sd_bus *bus, sd_bus_message *message, void *userda
         if (!isempty(init)) {
                 ri = strdup(init);
                 if (!ri) {
-                        free(ri);
+                        free(rt);
                         return -ENOMEM;
                 }
         }
@@ -1132,6 +1132,8 @@ static int method_switch_root(sd_bus *bus, sd_bus_message *message, void *userda
         free(m->switch_root_init);
         m->switch_root_init = ri;
 
+        m->exit_code = MANAGER_SWITCH_ROOT;
+
         return sd_bus_reply_method_return(message, NULL);
 }
 



More information about the systemd-commits mailing list