diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-08 12:59:03 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-08 12:59:03 +0200 |
| commit | a7adabc96ef9c34b6e05404169158c8eee6dce76 (patch) | |
| tree | 2cda759ffda1b20b8d07df1f089e6d14e0d7d46a /src/machine | |
| parent | d60f96798dfad2c9977eb79d99a6d525b46aa33c (diff) | |
| parent | 385080c09e48ea62a80525197f66f3347d96d2ce (diff) | |
Merge pull request #1192 from poettering/sd-bus-container
sd-bus: pass container bus errors up to calling process
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machine-dbus.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index fbeace0ed6..cc38116704 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -519,7 +519,7 @@ int bus_machine_method_open_pty(sd_bus_message *message, void *userdata, sd_bus_ return sd_bus_send(NULL, reply, NULL); } -static int container_bus_new(Machine *m, sd_bus **ret) { +static int container_bus_new(Machine *m, sd_bus_error *error, sd_bus **ret) { int r; assert(m); @@ -548,6 +548,8 @@ static int container_bus_new(Machine *m, sd_bus **ret) { bus->is_system = true; r = sd_bus_start(bus); + if (r == -ENOENT) + return sd_bus_error_set_errnof(error, r, "There is no system bus in container %s.", m->name); if (r < 0) return r; @@ -602,7 +604,7 @@ int bus_machine_method_open_login(sd_bus_message *message, void *userdata, sd_bu if (!p) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "PTS name %s is invalid", pty_name); - r = container_bus_new(m, &allocated_bus); + r = container_bus_new(m, error, &allocated_bus); if (r < 0) return r; @@ -704,7 +706,7 @@ int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bu utmp_id = path_startswith(pty_name, "/dev/"); assert(utmp_id); - r = container_bus_new(m, &allocated_bus); + r = container_bus_new(m, error, &allocated_bus); if (r < 0) return r; |