From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 17 Aug 2010 08:44:58 +0000 (+0200)
Subject: Merge commit 'v7'
X-Git-Tag: 8-2~16^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84f5f77335d249617abd2102a4b5624a29e4cfde;p=systemd

Merge commit 'v7'
---

84f5f77335d249617abd2102a4b5624a29e4cfde
diff --cc Makefile.am
index 05fb548e,b6041b5d..9cd91f57
--- a/Makefile.am
+++ b/Makefile.am
@@@ -188,15 -188,10 +188,17 @@@ dist_systemunit_DATA += 
  	units/fedora/rc-local.service \
  	units/fedora/reboot.service \
  	units/fedora/sysinit.service \
- 	units/fedora/single.service
+ 	units/fedora/single.service \
+ 	units/fedora/plymouth-quit.service \
+ 	units/fedora/plymouth-shutdown.service
  endif
 +if TARGET_DEBIAN
 +dist_systemunit_DATA += \
 +	units/debian/halt.service \
 +	units/debian/killall.service \
 +	units/debian/poweroff.service \
 +	units/debian/reboot.service
 +endif
  
  if TARGET_SUSE
  dist_systemunit_DATA += \