From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 9 Feb 2012 22:25:57 +0000 (+0100)
Subject: main: fix reexecution of systemd, use right path to binary
X-Git-Tag: v42~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05d02d8db0b3a7fd7634f7a0bd35ad96da469fb4;p=systemd

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

diff --git a/Makefile.am b/Makefile.am
index c5b819e4..122acfad 100644
--- 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 ed857f83..5ee199fb 100644
--- 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