From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 15 Dec 2017 15:49:43 +0000 (+0100)
Subject: main: move chdir("/") a bit earlier
X-Git-Tag: v237~209^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a2e0c6257a49a8a1d6b60b33c766f4ca96ade54;p=thirdparty%2Fsystemd.git

main: move chdir("/") a bit earlier

There's no need to do this within the block where logging is closed,
hence move it earlier, so that this block can be kept as small as
possible.
---

diff --git a/src/core/main.c b/src/core/main.c
index c3d0c017729..66270d4e0d1 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2405,6 +2405,9 @@ int main(int argc, char *argv[]) {
 
         assert_se(IN_SET(arg_action, ACTION_RUN, ACTION_TEST));
 
+        /* Move out of the way, so that we won't block unmounts */
+        assert_se(chdir("/") == 0);
+
         /* Close logging fds, in order not to confuse fdset below */
         log_close();
 
@@ -2426,9 +2429,6 @@ int main(int argc, char *argv[]) {
                         setsid();
         }
 
-        /* Move out of the way, so that we won't block unmounts */
-        assert_se(chdir("/") == 0);
-
         /* Reset the console, but only if this is really init and we
          * are freshly booted */
         if (arg_system && arg_action == ACTION_RUN) {