From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 27 May 2010 20:59:13 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: 0.git+20100605+dfd8ee-1~11^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=827ac65630f7f401a4876fb36d18530922871cf4;p=systemd

Merge remote branch 'origin/master'

Conflicts:
	units/getty@.service.m4
	units/multi-user.target.m4
---

827ac65630f7f401a4876fb36d18530922871cf4
diff --cc Makefile.am
index 2bbec807,a15777e3..e151b4a9
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,15 -154,17 +154,24 @@@ dist_systemunit_DATA += 
  	units/fedora/rc-local.service \
  	units/fedora/reboot.service \
  	units/fedora/sysinit.service
 +else
 +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_GENTOO
+ dist_systemunit_DATA += \
+ 	units/gentoo/halt.service \
+ 	units/gentoo/killall.service \
+ 	units/gentoo/poweroff.service \
+ 	units/gentoo/reboot.service \
+ 	units/gentoo/xdm.service
+ endif
+ 
  # This is needed because automake is buggy in how it generates the
  # rules for C programs, but not Vala programs.  We therefore can't
  # list the .h files as dependencies if we want make dist to work.
diff --cc units/getty@.service.m4
index 09eff9ed,31e8415c..d330fdf3
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@@ -6,17 -4,10 +4,10 @@@
  #  under the terms of the GNU General Public License as published by
  #  the Free Software Foundation; either version 2 of the License, or
  #  (at your option) any later version.
- #
- #  systemd is distributed in the hope that it will be useful, but
- #  WITHOUT ANY WARRANTY; without even the implied warranty of
- #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- #  General Public License for more details.
- #
- #  You should have received a copy of the GNU General Public License
- #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
  
  m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
+ m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
 -m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl
 +m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400 %I')')m4_dnl
  m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl
  m4_dnl
  [Unit]
diff --cc units/multi-user.target.m4
index bbb5224f,2cc74893..c808414a
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@@ -27,8 -17,6 +17,11 @@@ m4_ifdef(`TARGET_FEDORA'
  m4_dnl On Fedora Runlevel 3 is multi-user
  Names=runlevel3.target
  )m4_dnl
 +m4_dnl
 +m4_ifdef(`TARGET_DEBIAN',
 +m4_dnl On Debian Runlevel 2, 3, 4 and 5 are multi-user
 +Names=runlevel2.target runlevel3.target runlevel4.target runlevel5.target
 +)m4_dnl
+ m4_ifdef(`TARGET_SUSE',
+ Names=runlevel3.target
+ )m4_dnl