summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-08-17 18:00:48 +0200
committerLennart Poettering <lennart@poettering.net>2010-08-17 18:13:46 +0200
commit888c6216ca9239be260fd832f900b9fcd784f806 (patch)
tree27a1a15fb6db75cdcfcc840682a3a57fb643b5ba /src/main.c
parent322198005ace1aca0d504726f2444c84bd8b5430 (diff)
nss: don't disable nscd anymore, since it doesn't make sense to socket-activate nscd anyway
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/main.c b/src/main.c
index 51253c66c8..43b469fb06 100644
--- a/src/main.c
+++ b/src/main.c
@@ -975,20 +975,14 @@ int main(int argc, char *argv[]) {
log_full(arg_running_as == MANAGER_SYSTEM ? LOG_INFO : LOG_DEBUG,
PACKAGE_STRING " running in %s mode. (" SYSTEMD_FEATURES ")", manager_running_as_to_string(arg_running_as));
- if (arg_running_as == MANAGER_SYSTEM) {
+ if (arg_running_as == MANAGER_SYSTEM && !serialization) {
+ if (arg_show_status)
+ status_welcome();
- /* Disable nscd, to avoid deadlocks when systemd uses
- * NSS and the nscd socket is maintained by us. */
- nss_disable_nscd();
-
- if (!serialization) {
- if (arg_show_status)
- status_welcome();
- modprobe_setup(arg_nomodules);
- kmod_setup();
- hostname_setup();
- loopback_setup();
- }
+ modprobe_setup(arg_nomodules);
+ kmod_setup();
+ hostname_setup();
+ loopback_setup();
}
if ((r = manager_new(arg_running_as, &m)) < 0) {