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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2063 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  476b2e1feba3d72a87048c3884f6370a4d15d128 (commit)
       via  518d7dc58c9458fc4c3e2e91eaa628df99f73221 (commit)
      from  513adfb6e132795a0b46d5ceb75d23a4ff2453bb (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 476b2e1feba3d72a87048c3884f6370a4d15d128
Merge: 513adfb 518d7dc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 3 20:24:02 2012 +0200

    Merge remote-tracking branch 'stevee/plymouth'

commit 518d7dc58c9458fc4c3e2e91eaa628df99f73221
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Jul 3 20:11:50 2012 +0200

    plymouth: Fix twice specified postun scriptlet.

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

Summary of changes:
 plymouth/plymouth.nm |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 2e53c8a..957e321 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -5,7 +5,7 @@
 
 name       = plymouth
 version    = 0.8.5.1
-release    = 1
+release    = 2
 
 groups     = System/Base
 url        = http://www.freedesktop.org/wiki/Software/Plymouth
@@ -127,15 +127,14 @@ packages
 		# Tell systemd that unitfiles have been removed.
 		script postun
 			/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
+			# Remove initrd image with plymouth.
+			rm -f /boot/initrd-plymouth.img
 		end
 
 		script posttransin
 			/usr/lib/plymouth/plymouth-generate-initrd >/dev/null 2>&1
 		end
-
-		script postun
-			rm -f /boot/initrd-plymouth.img
-		end
 	end
 
 	package %{name}-libs


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