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 4fdbae4ae242a2939222d373b72d9ef941586181 (commit) via d6a8c34cdd3bedc13263fc76b87da15e5309dcd1 (commit) from 476b2e1feba3d72a87048c3884f6370a4d15d128 (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 4fdbae4ae242a2939222d373b72d9ef941586181 Merge: 476b2e1 d6a8c34 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jul 3 22:26:14 2012 +0200
Merge remote-tracking branch 'stevee/plymouth'
commit d6a8c34cdd3bedc13263fc76b87da15e5309dcd1 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Jul 3 21:08:33 2012 +0200
plymouth: Enable systemd plymouth service files.
We have to manually enable the systemd service files for plymouth for every single target.
-----------------------------------------------------------------------
Summary of changes: plymouth/plymouth.nm | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-)
Difference in files: diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm index 957e321..55e1720 100644 --- a/plymouth/plymouth.nm +++ b/plymouth/plymouth.nm @@ -5,7 +5,7 @@
name = plymouth version = 0.8.5.1 -release = 2 +release = 3
groups = System/Base url = http://www.freedesktop.org/wiki/Software/Plymouth @@ -71,6 +71,10 @@ build autoreconf -vfi end
+ # Fix install location for systemd files. + make_install_targets += \ + SYSTEMD_UNIT_DIR=%{unitdir} + install_cmds mkdir -pv %{BUILDROOT}%{datadir}/plymouth mkdir -pv %{BUILDROOT}%{localstatedir}/lib/plymouth @@ -83,6 +87,23 @@ build cp -vf %{DIR_SOURCE}/plymouth-update-initrd \ %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd chmod 755 %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd + + # XXX - may we can remove this at a later time. + # + # Enable plymouth systemd service files and link them to the correct targets. + mkdir -pv %{BUILDROOT}%{unitdir}/halt.target.wants + mkdir -pv %{BUILDROOT}%{unitdir}/multi-user.target.wants + mkdir -pv %{BUILDROOT}%{unitdir}/poweroff.target.wants + mkdir -pv %{BUILDROOT}%{unitdir}/reboot.target.wants + mkdir -pv %{BUILDROOT}%{unitdir}/sysinit.target.wants + + ln -svf ../plymouth-halt.service %{BUILDROOT}%{unitdir}/halt.target.wants/plymouth-halt.service + ln -svf ../plymouth-quit.service %{BUILDROOT}%{unitdir}/multi-user.target.wants/plymouth-quit.service + ln -svf ../plymouth-quit-wait.service %{BUILDROOT}%{unitdir}/multi-user.target.wants/plymouth-quit-wait.service + ln -svf ../plymouth-poweroff.service %{BUILDROOT}%{unitdir}/poweroff.target.wants/plymouth-poweroff.service + ln -svf ../plymouth-reboot.service %{BUILDROOT}%{unitdir}/reboot.target.wants/plymouth-reboot.service + ln -svf ../plymouth-read-write.service %{BUILDROOT}%{unitdir}/sysinit.target.wants/plymouth-read-write.service + ln -svf ../plymouth-start.service %{BUILDROOT}%{unitdir}/sysinit.target.wants/plymouth-start.service end end
@@ -128,7 +149,6 @@ packages script postun /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
- # Remove initrd image with plymouth. rm -f /boot/initrd-plymouth.img end
hooks/post-receive -- IPFire 3.x development tree