diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-06-28 00:41:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-06-28 00:41:24 +0200 |
| commit | 241da3287d0c16f79e2f415f17543599b3e73c85 (patch) | |
| tree | f4fad09d26712732068016b97b8e66ee32357441 /src/core/unit.c | |
| parent | dbus: hookup runtime property changes for mouns, services, sockets, swaps too (diff) | |
| download | systemd-241da3287d0c16f79e2f415f17543599b3e73c85.tar.xz systemd-241da3287d0c16f79e2f415f17543599b3e73c85.zip | |
unit: make sure the dropins we write are high-priority
Diffstat (limited to '')
| -rw-r--r-- | src/core/unit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index 211704e230..afeb15c154 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2675,7 +2675,7 @@ static int drop_in_file(Unit *u, UnitSetPropertiesMode mode, const char *name, c if (!p) return -ENOMEM; - q = strjoin(p, "/50-", name, ".conf", NULL); + q = strjoin(p, "/90-", name, ".conf", NULL); if (!q) { free(p); return -ENOMEM; @@ -2733,9 +2733,9 @@ int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name) { r = drop_in_file(u, mode, name, &p, &q); if (unlink(q) < 0) - r = -errno; + r = errno == ENOENT ? 0 : -errno; else - r = 0; + r = 1; rmdir(p); return r; |