systemd: Enable readahead by default.

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

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index bcb25253475854a652072e0c877e794c5c135726..34fda47335734550f87584a7e168815b706a787a 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 44
-release    = 2
+release    = 5
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -47,6 +47,7 @@ build
 
        configure_options += \
                --libexecdir=%{libdir} \
+               --with-udevrulesdir=%{prefix}/lib/udev/rules.d \
                --with-distro=ipfire
 
        prepare_cmds
@@ -75,9 +76,10 @@ build
                cp -vf %{DIR_SOURCE}/{locale,vconsole}.conf %{BUILDROOT}%{sysconfdir}
 
                # Recreate all targets
-               rm -rfv %{BUILDROOT}%{unitdir}/*.target.wants
-               for i in basic.target.wants default.target.wants dbus.target.wants syslog.target.wants; do
-                       mkdir -pv %{BUILDROOT}%{unitdir}/${i} || exit 1
+               rm -rfv %{BUILDROOT}/%{sysconfdir}/systemd/system/*.target.wants
+               for i in basic.target.wants default.target.wants dbus.target.wants getty.target.wants \
+                       multi-user.target.wants syslog.target.wants; do
+                               mkdir -pv %{BUILDROOT}/%{sysconfdir}/systemd/system/${i} || exit 1
                done
 
                # Remove runlevel targets and graphical.target
@@ -93,14 +95,6 @@ build
                        ln -svf ../system/${i}.target ${i}.target || exit 1
                done
 
-               # Replace absolute symlink for getty@tty1.service.
-               ln -svf ../../../../%{unitdir}/getty@.service \
-                       %{BUILDROOT}%{sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
-
-               # Replace absolute symlink for remote-fs.target.
-               ln -svf ../../../../%{unitdir}/remote-fs.target \
-                       %{BUILDROOT}%{sysconfdir}/systemd/system/multi-user.target.wants/remote-fs.target
-
                # Remove tmpfile for X11
                rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
 
@@ -150,10 +144,18 @@ packages
                                # Try harder
                                grep -q pam_systemd /etc/pam.d/system-auth-ac || authconfig --updateall --nostart >/dev/null 2>&1 || :
                        fi
+
+                       /usr/bin/systemctl enable \
+                               getty@.service \
+                               remote-fs.service \
+                               systemd-readahead-replay.service \
+                               systemd-readahead-collect.service \
+                               >/dev/null 2>&1 || :
                end
 
                script postup
                        # 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 || :
                end
        end