diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-23 00:48:02 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-23 00:48:02 +0200 |
| commit | 5c781d6b0dd2d5fce3cacd653ac10556e39b857b (patch) | |
| tree | b14b0f6bc158da6984e4de76ac43e3d2ab4eace4 /src/core | |
| parent | 73de5e9464e0b50db45dc1d2278a9eba3fa4fc79 (diff) | |
| parent | 8ebfe0cbaad12b55fd022650a841149a548d3e60 (diff) | |
Merge pull request #1346 from dvdhrm/user-shutdown
core: fix shutdown of --user
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/main.c b/src/core/main.c index 9c1f8648e7..b57f4c1b7a 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1807,6 +1807,13 @@ int main(int argc, char *argv[]) { goto finish; case MANAGER_EXIT: + if (m->running_as == MANAGER_USER) { + retval = EXIT_SUCCESS; + log_debug("Exit."); + goto finish; + } + + /* fallthrough */ case MANAGER_REBOOT: case MANAGER_POWEROFF: case MANAGER_HALT: |