summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2012-02-08 00:08:10 +0100
committerKay Sievers <kay.sievers@vrfy.org>2012-02-08 00:08:10 +0100
commite0d25329b23a43332ea340f9907721873a316f4e (patch)
tree07e99accab5ac6d2b14c1cfb1768a1401e513130
parent1d4ec315707a9d1411efc5d2ef4a47f9374ab525 (diff)
move /usr/bin/systemd to /usr/lib/systemd/systemd
-rw-r--r--Makefile.am2
-rw-r--r--NEWS5
-rw-r--r--man/systemd-nspawn.xml2
-rw-r--r--units/user@.service.in2
4 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index f1f975fcf3..e4e3510ddf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -161,7 +161,6 @@ endif
endif
rootbin_PROGRAMS = \
- systemd \
systemctl \
systemd-notify \
systemd-ask-password \
@@ -185,6 +184,7 @@ bin_PROGRAMS += \
endif
rootlibexec_PROGRAMS = \
+ systemd \
systemd-cgroups-agent \
systemd-initctl \
systemd-update-utmp \
diff --git a/NEWS b/NEWS
index 5368e82ffd..e8a0cfd11c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
systemd System and Service Manager
+CHANGES WITH 41:
+ * The systemd binary is installed /usr/lib/systemd/systemd now;
+ An existing /sbin/init symlink needs to be adapted with the
+ package update.
+
CHANGES WITH 40:
* This is mostly a bugfix release
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index d5f8465506..dbd2ff5a8a 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -185,7 +185,7 @@
<title>Example 2</title>
<programlisting># mock --init
-# systemd-nspawn -D /var/lib/mock/fedora-rawhide-x86_64/root/ /bin/systemd systemd.log_level=debug</programlisting>
+# systemd-nspawn -D /var/lib/mock/fedora-rawhide-x86_64/root/ /sbin/init systemd.log_level=debug</programlisting>
<para>This installs a minimal Fedora distribution into
a subdirectory of <filename>/var/lib/mock/</filename>
diff --git a/units/user@.service.in b/units/user@.service.in
index 59fe5242d6..91e3b25158 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -15,5 +15,5 @@ PAMName=systemd-shared
ControlGroup=%R/user/%I/shared cpu:/
ControlGroupModify=yes
Type=notify
-ExecStart=-@rootbindir@/systemd --user
+ExecStart=-@rootlibexecdir@/systemd --user
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket