picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: when an already abandoned unit gets abandoned again generate a clean error

Browse source
This commit is contained in:
Lennart Poettering 2014-02-07 17:59:27 +01:00
parent ba4c5d93b7
commit 4e2f8d2778
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -36,6 +36,8 @@ External:
Features: Features:
* nspawn: rename --file-label to --apifs-label
* hookup nspawn and PrivateNetwork=yes with "ip netns" * hookup nspawn and PrivateNetwork=yes with "ip netns"
* socket units: support creating sockets in different namespace, * socket units: support creating sockets in different namespace,

11
src/core/dbus-scope.c
View file

@ -27,15 +27,24 @@
#include "dbus-scope.h" #include "dbus-scope.h"
#include "bus-util.h" #include "bus-util.h"
#include "bus-internal.h" #include "bus-internal.h"
#include "bus-errors.h"
static int bus_scope_abandon(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { static int bus_scope_abandon(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
Scope *s = userdata; Scope *s = userdata;
int r;
assert(bus); assert(bus);
assert(message); assert(message);
assert(s); assert(s);
return scope_abandon(s); r = scope_abandon(s);
if (sd_bus_error_is_set(error))
return r;
if (r == -ESTALE)
return sd_bus_error_setf(error, BUS_ERROR_SCOPE_NOT_RUNNING, "Scope %s is not running, cannot abandon.", UNIT(s)->id);
return sd_bus_reply_method_return(message, NULL);
} }
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, scope_result, ScopeResult); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, scope_result, ScopeResult);

3
src/login/logind-dbus.c
View file

@ -2384,7 +2384,8 @@ int manager_abandon_scope(Manager *manager, const char *scope, sd_bus_error *err
NULL); NULL);
if (r < 0) { if (r < 0) {
if (sd_bus_error_has_name(error, BUS_ERROR_NO_SUCH_UNIT) || if (sd_bus_error_has_name(error, BUS_ERROR_NO_SUCH_UNIT) ||
sd_bus_error_has_name(error, BUS_ERROR_LOAD_FAILED)) { sd_bus_error_has_name(error, BUS_ERROR_LOAD_FAILED) ||
sd_bus_error_has_name(error, BUS_ERROR_SCOPE_NOT_RUNNING)) {
sd_bus_error_free(error); sd_bus_error_free(error);
return 0; return 0;
} }

1
src/shared/bus-errors.h
View file

@ -37,6 +37,7 @@
#define BUS_ERROR_JOB_TYPE_NOT_APPLICABLE "org.freedesktop.systemd1.JobTypeNotApplicable" #define BUS_ERROR_JOB_TYPE_NOT_APPLICABLE "org.freedesktop.systemd1.JobTypeNotApplicable"
#define BUS_ERROR_NO_ISOLATION "org.freedesktop.systemd1.NoIsolation" #define BUS_ERROR_NO_ISOLATION "org.freedesktop.systemd1.NoIsolation"
#define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown" #define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown"
#define BUS_ERROR_SCOPE_NOT_RUNNING "org.freedesktop.systemd1.ScopeNotRunning"
#define BUS_ERROR_NO_SUCH_MACHINE "org.freedesktop.machine1.NoSuchMachine" #define BUS_ERROR_NO_SUCH_MACHINE "org.freedesktop.machine1.NoSuchMachine"
#define BUS_ERROR_NO_MACHINE_FOR_PID "org.freedesktop.machine1.NoMachineForPID" #define BUS_ERROR_NO_MACHINE_FOR_PID "org.freedesktop.machine1.NoMachineForPID"