diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2018-08-23 08:21:15 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
| commit | b25b2a67797b33975179e17c97baba19bbf020ab (patch) | |
| tree | b4a603bcfb5e130662d00f3ab2cff0d8ce8f83ab /src/login/logind.c | |
| parent | ae13c1d48a78a6273e403f690ed7d9538a31070a (diff) | |
Prep v239: Fix main() to call manager_new() again.
Diffstat (limited to 'src/login/logind.c')
| -rw-r--r-- | src/login/logind.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/login/logind.c b/src/login/logind.c index 4c4577965..d87c38181 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -1291,12 +1291,6 @@ int main(int argc, char *argv[]) { (void) mkdir_label("/run/systemd/seats", 0755); (void) mkdir_label("/run/systemd/users", 0755); (void) mkdir_label("/run/systemd/sessions", 0755); - - assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGHUP, SIGTERM, SIGINT, -1) >= 0); - - r = manager_new(&m); - if (r < 0) { - log_error_errno(r, "Failed to allocate manager object: %m"); #else r = mkdir_label("/run/systemd", 0755); if ( (r < 0) && (-EEXIST != r) ) @@ -1315,6 +1309,14 @@ int main(int argc, char *argv[]) { return log_error_errno(r, "Failed to create /run/systemd/machines : %m"); #endif // 0 + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGHUP, SIGTERM, SIGINT, -1) >= 0); + + r = manager_new(&m); + if (r < 0) { + log_error_errno(r, "Failed to allocate manager object: %m"); + goto finish; + } + (void) manager_parse_config_file(m); #if 1 /// elogind needs an Add-On for sleep configuration |