chiark / gitweb /
core: actually make SwitchRoot() bus call do the deed
authorLennart Poettering <lennart@poettering.net>
Thu, 21 Nov 2013 20:36:04 +0000 (21:36 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 21 Nov 2013 20:36:04 +0000 (21:36 +0100)
src/core/dbus-manager.c

index 6002d02c5bb50e8a2b0c113086104344e8e46c58..c560cac18fa47a6b3bac6f16de96e878ce256773 100644 (file)
@@ -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);
 }