systemd: Add legacy tmpfile for autocreate /run/lock directory.

[people/ms/ipfire-3.x.git] / systemd / systemd.nm

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 0b6b5cb85ca2e7d283794761e544fc8c391c9b9e..d93414bc3f712bf8d3398cb8817e1ba89c9886ce 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 187
-release    = 1
+version    = 196
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -24,6 +24,7 @@ build
        unitdir = %{prefix}/lib/systemd/system
 
        requires
+               attr-devel
                audit-devel
                automake
                autoconf
@@ -41,8 +42,10 @@ build
                libacl-devel
                libblkid-devel
                libcap-devel
+               libgcrypt-devel
                libselinux-devel
                libtool
+               libuuid-devel
                pam-devel
                pciutils-devel
                usbutils
@@ -59,6 +62,9 @@ build
        end
 
        install_cmds
+               # Create folder in log to store the journal.
+               mkdir -pv %{BUILDROOT}/var/log/journal
+
                # Create sysv compatible symlinks.
                mkdir -pv %{BUILDROOT}%{sbindir}
                ln -svf ../lib/systemd/systemd  %{BUILDROOT}/%{sbindir}/init
@@ -104,6 +110,16 @@ build
 
                # Remove unneeded symlink for xdg
                rm -rfv %{BUILDROOT}/etc/xdg/systemd
+
+               # Use journald. Enable the import of kernel messages.
+               # Stop forwarding to a syslog daemon.
+               sed \
+                       -e "s/^#ForwardToSyslog=.*$/ForwardToSyslog=no/" \
+                       -e "s/^#ImportKernel=.*$/ImportKernel=yes/" \
+                       -i %{BUILDROOT}/etc/systemd/journald.conf
+
+               # Install legacy tmpfile to autocreate /run/lock on startup.
+               install -v -m 644 %{DIR_APP}/tmpfiles.d/legacy.conf %{BUILDROOT}%{prefix}/lib/tmpfiles.d/
        end
 end
 
@@ -130,12 +146,14 @@ packages
                        /sbin/reboot
                        /sbin/shutdown
 
+                       syslog
                        udev = %{thisver}
                end
 
                conflicts
                        dracut < 019
                        filesystem < 002
+                       rsyslog < 5.8.6-4
                        upstart
                end
 
@@ -195,6 +213,12 @@ packages
                        # Restart login service after update
                        /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
                        /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
+
+                       # Use the new journald configuration file and restart the service.
+                       if ! grep -xq ImportKernel=yes /etc/systemd/journald.conf ; then
+                               mv /etc/systemd/journald.conf.paknew /etc/systemd/journald.conf
+                               /usr/bin/systemctl restart systemd-journald.service >/dev/null 2>&1 || :
+                       fi
                end
 
                # Be sure to start the new udev after everything is done.
@@ -240,6 +264,10 @@ packages
                end
        end
 
+       package %{name}-libs
+               template LIBS
+       end
+
        package %{name}-devel
                template DEVEL
 
@@ -259,7 +287,7 @@ packages
                end
 
                files
-                       %{libdir}/libgudev*.so.*
+                       %{libdir}/lib*udev*.so.*
                        %{libidr}/girepository*/
                end
        end