summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-11 00:48:52 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-11 00:48:52 +0200
commitbefb5b6a71c175d523644edbddd01b4b722fe956 (patch)
treed50ae3cae8069b81f9c9f5104a0928604420c308
parentf6940be7825755d77ade4cd42231aab9e3580623 (diff)
core: rearrange if blocks a bit
-rw-r--r--src/core/main.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 0ba1d15033..749397578a 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1515,12 +1515,7 @@ int main(int argc, char *argv[]) {
/* All other variables are left as is, so that clients
* can still read them via /proc/1/environ */
- }
-
- /* Move out of the way, so that we won't block unmounts */
- assert_se(chdir("/") == 0);
- if (arg_running_as == SYSTEMD_SYSTEM) {
/* Become a session leader if we aren't one yet. */
setsid();
@@ -1528,6 +1523,9 @@ int main(int argc, char *argv[]) {
umask(0);
}
+ /* Move out of the way, so that we won't block unmounts */
+ assert_se(chdir("/") == 0);
+
/* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */
dbus_connection_set_change_sigpipe(FALSE);