[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a4b4a2fdf0dbbf1eff40a1423145cc1cac9b7364

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2849 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  a4b4a2fdf0dbbf1eff40a1423145cc1cac9b7364 (commit)
       via  5e462903793977f1790eb4caf8fc63ee64572410 (commit)
      from  9be5274ac44654acfa0e27220221997955420013 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a4b4a2fdf0dbbf1eff40a1423145cc1cac9b7364
Merge: 5e46290 9be5274
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Apr 27 14:22:07 2012 +0200

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 5e462903793977f1790eb4caf8fc63ee64572410
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Apr 27 14:21:42 2012 +0200

    systemd: Enable readahead by default.

-----------------------------------------------------------------------

Summary of changes:
 systemd/systemd.nm |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 95bf4f7..34fda47 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 44
-release    = 4
+release    = 5
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -95,14 +95,6 @@ build
 			ln -svf ../system/${i}.target ${i}.target || exit 1
 		done
 
-		# Replace absolute symlink for getty(a)tty1.service.
-		ln -svf ../../../../%{unitdir}/getty(a).service \
-			%{BUILDROOT}%{sysconfdir}/systemd/system/getty.target.wants/getty(a)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
 
@@ -152,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(a).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


hooks/post-receive
--
IPFire 3.x development tree