Commit ad780f19 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

main: disable nscd if we can to avoid deadlock, just in case

parent 949c6510
...@@ -53,8 +53,6 @@ ...@@ -53,8 +53,6 @@
* systemd-install disable should recursively kill all symlinks * systemd-install disable should recursively kill all symlinks
* __nss_disable_nscd() aufrufen um loops zu verhindern
* in %post create all symlinks manually and use inittab data * in %post create all symlinks manually and use inittab data
* check mtimes of dirs and unit files in systemctl * check mtimes of dirs and unit files in systemctl
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#define _unlikely_(x) (__builtin_expect(!!(x),0)) #define _unlikely_(x) (__builtin_expect(!!(x),0))
#define _public_ __attribute__ ((visibility("default"))) #define _public_ __attribute__ ((visibility("default")))
#define _hidden_ __attribute__ ((visibility("hidden"))) #define _hidden_ __attribute__ ((visibility("hidden")))
#define _weakref_(x) __attribute__((weakref(#x)))
/* Rounds up */ /* Rounds up */
static inline size_t ALIGN(size_t l) { static inline size_t ALIGN(size_t l) {
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "special.h" #include "special.h"
#include "conf-parser.h" #include "conf-parser.h"
#include "bus-errors.h" #include "bus-errors.h"
#include "missing.h"
static enum { static enum {
ACTION_RUN, ACTION_RUN,
...@@ -935,7 +936,17 @@ int main(int argc, char *argv[]) { ...@@ -935,7 +936,17 @@ int main(int argc, char *argv[]) {
log_info(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as)); log_info(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as));
if (arg_running_as == MANAGER_SYSTEM && !serialization) { if (arg_running_as == MANAGER_SYSTEM) {
/* Disable nscd, to avoid deadlocks when systemd uses
* NSS and the nscd socket is maintained by us. */
if (nss_disable_nscd) {
log_debug("Disabling nscd");
nss_disable_nscd();
} else
log_debug("Hmm, can't disable nscd.");
if (!serialization) {
if (arg_show_status) if (arg_show_status)
status_welcome(); status_welcome();
modprobe_setup(arg_nomodules); modprobe_setup(arg_nomodules);
...@@ -943,6 +954,7 @@ int main(int argc, char *argv[]) { ...@@ -943,6 +954,7 @@ int main(int argc, char *argv[]) {
hostname_setup(); hostname_setup();
loopback_setup(); loopback_setup();
} }
}
if ((r = manager_new(arg_running_as, &m)) < 0) { if ((r = manager_new(arg_running_as, &m)) < 0) {
log_error("Failed to allocate manager object: %s", strerror(-r)); log_error("Failed to allocate manager object: %s", strerror(-r));
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include "macro.h"
#ifndef RLIMIT_RTTIME #ifndef RLIMIT_RTTIME
#define RLIMIT_RTTIME 15 #define RLIMIT_RTTIME 15
#endif #endif
...@@ -53,4 +55,12 @@ static inline int pivot_root(const char *new_root, const char *put_old) { ...@@ -53,4 +55,12 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
return syscall(SYS_pivot_root, new_root, put_old); return syscall(SYS_pivot_root, new_root, put_old);
} }
/* This is an internal glibc function call. We are not supposed to
* call this, because we are not nscd. However sometimes we feel
* really dangerous and do it nonetheless. Muahahah! But at least we
* protect this with a weak ref just in case glibc takes this away
* from us. */
static void nss_disable_nscd(void) _weakref_(__nss_disable_nscd);
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment