main: fix reexecution of systemd, use right path to binary

diff --git a/Makefile.am b/Makefile.am
index c5b819e4cd73056c166bf085f98c7b903ed2bec2..122acfad9002dbb0e7b34752b9e7c57267d7d5e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-       -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+       -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \

diff --git a/TODO b/TODO
index ed857f836b5426fbc44e2a30bd843d532cc289f5..5ee199fb3766e2caa8b19c325861ec9769ccf98b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -21,6 +21,8 @@ Bugfixes:
 
 Features:
 
+* support closing all fds via RLIMIT_NOFILE instead of /proc, in order to make chroot stuff work.
+
 * add interface to allow immediate rotation of the journal, and even flushing.
 
 * don't log coredumps of PID 1 into the journal