chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f6940be
)
core: rearrange if blocks a bit
author
Lennart Poettering
<lennart@poettering.net>
Wed, 10 Jul 2013 22:48:52 +0000
(
00:48
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 10 Jul 2013 22:48:52 +0000
(
00:48
+0200)
src/core/main.c
patch
|
blob
|
history
diff --git
a/src/core/main.c
b/src/core/main.c
index 0ba1d15033253379a4240920054545d88284fc2a..749397578abd2be949ed30503c20f5546ad8dc47 100644
(file)
--- 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 */
/* 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();
/* Become a session leader if we aren't one yet. */
setsid();
@@
-1528,6
+1523,9
@@
int main(int argc, char *argv[]) {
umask(0);
}
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);
/* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */
dbus_connection_set_change_sigpipe(FALSE);