chiark / gitweb /
move /usr/bin/systemd to /usr/lib/systemd/systemd
authorKay Sievers <kay.sievers@vrfy.org>
Tue, 7 Feb 2012 23:08:10 +0000 (00:08 +0100)
committerKay Sievers <kay.sievers@vrfy.org>
Tue, 7 Feb 2012 23:08:10 +0000 (00:08 +0100)
Makefile.am
NEWS
man/systemd-nspawn.xml
units/user@.service.in

index f1f975f..e4e3510 100644 (file)
@@ -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 5368e82..e8a0cfd 100644 (file)
--- 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
 
index d5f8465..dbd2ff5 100644 (file)
                 <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>
index 59fe524..91e3b25 100644 (file)
@@ -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