From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 10 Jul 2013 22:48:52 +0000 (+0200)
Subject: core: rearrange if blocks a bit
X-Git-Tag: v206~147
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=befb5b6a71c175d523644edbddd01b4b722fe956

core: rearrange if blocks a bit
---

diff --git a/src/core/main.c b/src/core/main.c
index 0ba1d1503..749397578 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);