From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 7 Feb 2012 23:08:10 +0000 (+0100)
Subject: move /usr/bin/systemd to /usr/lib/systemd/systemd
X-Git-Tag: v41~18
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d25329b23a43332ea340f9907721873a316f4e;p=systemd

move /usr/bin/systemd to /usr/lib/systemd/systemd
---

diff --git a/Makefile.am b/Makefile.am
index f1f975fc..e4e3510d 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 5368e82f..e8a0cfd1 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 d5f84655..dbd2ff5a 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 59fe5242..91e3b251 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