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 (from parent 1:
3d14178
)
manager: use a private notify sockets in containers to avoid problems with shared...
author
Lennart Poettering
<lennart@poettering.net>
Thu, 19 Jul 2012 00:17:50 +0000
(
02:17
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 19 Jul 2012 00:17:50 +0000
(
02:17
+0200)
src/core/manager.c
patch
|
blob
|
history
diff --git
a/src/core/manager.c
b/src/core/manager.c
index 27dc9f38e0ec0d80d9f7af11e98d144e03495adb..48305e373a5d8864f3bf06ff6f7c4328ac9b7d78 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-96,7
+96,7
@@
static int manager_setup_notify(Manager *m) {
zero(sa);
sa.sa.sa_family = AF_UNIX;
zero(sa);
sa.sa.sa_family = AF_UNIX;
- if (getpid() != 1)
+ if (getpid() != 1
|| detect_container(NULL) > 0
)
snprintf(sa.un.sun_path, sizeof(sa.un.sun_path), NOTIFY_SOCKET "/%llu", random_ull());
else
strncpy(sa.un.sun_path, NOTIFY_SOCKET, sizeof(sa.un.sun_path));
snprintf(sa.un.sun_path, sizeof(sa.un.sun_path), NOTIFY_SOCKET "/%llu", random_ull());
else
strncpy(sa.un.sun_path, NOTIFY_SOCKET, sizeof(sa.un.sun_path));