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

diff --git a/Makefile.am b/Makefile.am
index f1f975fcf3b91abb48075e9689c517ee869b17bd..e4e3510ddf9d9f255f3d1064fe10b6fc98143b41 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -161,7 +161,6 @@ endif
 endif
 
 rootbin_PROGRAMS = \
 endif
 
 rootbin_PROGRAMS = \

-       systemd \

        systemctl \
        systemd-notify \
        systemd-ask-password \
        systemctl \
        systemd-notify \
        systemd-ask-password \


@@ -185,6 +184,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
 endif
 
 rootlibexec_PROGRAMS = \

+       systemd \

        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \

diff --git a/NEWS b/NEWS
index 5368e82ffd0b209e531f7b7d3ad7e361f7a961b4..e8a0cfd11c5a220ab255a842f6bc4f3d3bb18b41 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 systemd System and Service Manager
 
 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
 
 CHANGES WITH 40:
         * This is mostly a bugfix release
 

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index d5f8465506b914ef495513a6cbb143886c6c281f..dbd2ff5a8add5448ea0a2c0dc1e40473cb593d25 100644 (file)
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -185,7 +185,7 @@
                 <title>Example 2</title>
 
                 <programlisting># mock --init
                 <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>
 
                 <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 59fe5242d6a77a1956c090ed52aa0d305511de92..91e3b2515836827750eef478a9c2787d3212f0dc 100644 (file)
--- 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
 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
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket