From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 14 Jul 2010 18:01:02 +0000 (+0200)
Subject: Merge commit 'v3'
X-Git-Tag: 8-2~24^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c25ce51ba85b934f0b0e31aa5751dfbc34172f6;p=systemd

Merge commit 'v3'
---

1c25ce51ba85b934f0b0e31aa5751dfbc34172f6
diff --cc Makefile.am
index e218cea2,ff8e847b..ab61bfeb
--- a/Makefile.am
+++ b/Makefile.am
@@@ -182,15 -186,9 +186,16 @@@ dist_systemunit_DATA += 
  	units/fedora/prefdm.service \
  	units/fedora/rc-local.service \
  	units/fedora/reboot.service \
- 	units/fedora/sysinit.service
+ 	units/fedora/sysinit.service \
+ 	units/fedora/single.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 += \