[systemd-commits] 2 commits - src/machine src/shared

[Lennart Poettering]

 src/machine/machined-dbus.c |    2 +-
 src/shared/switch-root.c    |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 8d07a7c47159ebc2bcc775e2c1997cb44bd1ac95
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 6 20:00:14 2014 +0100

    machined: reorder method calls in vtable

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 7f8c631..20a98ee 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -442,8 +442,8 @@ const sd_bus_vtable manager_vtable[] = {
         SD_BUS_METHOD("GetMachineByPID", "u", "o", method_get_machine_by_pid, SD_BUS_VTABLE_UNPRIVILEGED),
         SD_BUS_METHOD("ListMachines", NULL, "a(ssso)", method_list_machines, SD_BUS_VTABLE_UNPRIVILEGED),
         SD_BUS_METHOD("CreateMachine", "sayssusa(sv)", "o", method_create_machine, 0),
-        SD_BUS_METHOD("RegisterMachine", "sayssus", "o", method_register_machine, 0),
         SD_BUS_METHOD("CreateMachineWithNetwork", "sayssusaia(sv)", "o", method_create_machine_with_network, 0),
+        SD_BUS_METHOD("RegisterMachine", "sayssus", "o", method_register_machine, 0),
         SD_BUS_METHOD("RegisterMachineWithNetwork", "sayssusai", "o", method_register_machine_with_network, 0),
         SD_BUS_METHOD("KillMachine", "ssi", NULL, method_kill_machine, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)),
         SD_BUS_METHOD("TerminateMachine", "s", NULL, method_terminate_machine, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)),

commit 64e18fd626838c3500e28b4dbf86ed62206fff47
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 6 20:00:01 2014 +0100

    switch-root: explain why we don't care about base_filesystem_create() failing

diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
index 1a558b8..3adb846 100644
--- a/src/shared/switch-root.c
+++ b/src/shared/switch-root.c
@@ -102,6 +102,11 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot,
                 }
         }
 
+        /* Do not fail, if base_filesystem_create() fails. Not all
+         * switch roots are like base_filesystem_create() wants them
+         * to look like. They might even boot, if they are RO and
+         * don't have the FS layout. Just ignore the error and
+         * switch_root() nevertheless. */
         (void) base_filesystem_create(new_root);
 
         if (chdir(new_root) < 0) {