diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-09 23:18:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-09 23:43:16 +0200 |
| commit | a821caaae15a39cd38be6dd3d1c3ca37c4ac0364 (patch) | |
| tree | 2d0d6cc910aedfaae255e127286333d8bc0907b0 | |
| parent | 71a6f7538199f571b92e0c9fbb5819f8ce0e0d20 (diff) | |
main: make it possible to run a system daemon along side an aloready running one for testing purposes
| -rw-r--r-- | src/dbus.c | 2 | ||||
| -rw-r--r-- | src/manager.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus.c b/src/dbus.c index 2998c5817..1620469e0 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -907,7 +907,7 @@ static int bus_init_private(Manager *m) { return 0; /* We want the private bus only when running as init */ - if (m->running_as != MANAGER_SYSTEM) + if (getpid() != 1) return 0; if (!(m->private_bus = dbus_server_listen("unix:abstract=/org/freedesktop/systemd1/private", &error))) { diff --git a/src/manager.c b/src/manager.c index adff54639..638ef2f45 100644 --- a/src/manager.c +++ b/src/manager.c @@ -83,7 +83,7 @@ static int manager_setup_notify(Manager *m) { zero(sa); sa.sa.sa_family = AF_UNIX; - if (m->running_as == MANAGER_SESSION) + if (getpid() != 1) snprintf(sa.un.sun_path+1, sizeof(sa.un.sun_path)-1, NOTIFY_SOCKET "/%llu", random_ull()); else strncpy(sa.un.sun_path+1, NOTIFY_SOCKET, sizeof(sa.un.sun_path)-1); |