[systemd-commits] 4 commits - fixme src/dbus.c src/install.c src/manager.c src/socket.c

[Lennart Poettering]

 fixme         |   10 ++++++++++
 src/dbus.c    |    2 +-
 src/install.c |    2 ++
 src/manager.c |    2 +-
 src/socket.c  |    2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit ab5506a922e407826c08506f3cc1ad69be16fd36
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 9 23:42:59 2010 +0200

    update fixme

diff --git a/fixme b/fixme
index e71a97a..d05d0a3 100644
--- a/fixme
+++ b/fixme
@@ -35,6 +35,16 @@
 
 * selinux
 
+* .socket should refuse start when .service is already up to avoid overwriting the socket
+
+* introduce umount.target
+
+* pull in umount.target and shutdown.target from emergency.service (?)
+
+* extend recommendations to depend on syslog.target via "After"
+
+* Don't show Accepted/Connected for non-Accept sockets
+
 External:
 
 * patch /etc/init.d/functions with:
commit 25366e094c749a613eb065829c424ef72c285e82
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 9 23:19:28 2010 +0200

    socket: fix loading of .service files for .socket files

diff --git a/src/socket.c b/src/socket.c
index acd49a5..075b519 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -268,7 +268,7 @@ static int socket_load(Unit *u) {
         if (u->meta.load_state == UNIT_LOADED) {
 
                 if (have_non_accept_socket(s)) {
-                        if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)))
+                        if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)) < 0)
                                 return r;
 
                         if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service), true)) < 0)
commit a821caaae15a39cd38be6dd3d1c3ca37c4ac0364
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 9 23:18:50 2010 +0200

    main: make it possible to run a system daemon along side an aloready running one for testing purposes

diff --git a/src/dbus.c b/src/dbus.c
index 2998c58..1620469 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 adff546..638ef2f 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);
commit 71a6f7538199f571b92e0c9fbb5819f8ce0e0d20
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 9 23:05:59 2010 +0200

    install: properly parse --realize=reload

diff --git a/src/install.c b/src/install.c
index a05002d..2c57c9b 100644
--- a/src/install.c
+++ b/src/install.c
@@ -148,6 +148,8 @@ static int parse_argv(int argc, char *argv[]) {
                                 arg_realize = REALIZE_MAYBE;
                         else if (streq(optarg, "yes"))
                                 arg_realize = REALIZE_YES;
+                        else if (streq(optarg, "reload"))
+                                arg_realize = REALIZE_RELOAD;
                         else {
                                 log_error("Invalid --realize argument %s", optarg);
                                 return -EINVAL;