From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 6 Jul 2010 17:49:59 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: 8-2~29^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b07807c875bdfbcb312ae2e4706cf191319e443;p=systemd

Merge remote branch 'origin/master'
---

7b07807c875bdfbcb312ae2e4706cf191319e443
diff --cc units/getty@.service.m4
index a302bf97,f1f7f326..ef52e0b4
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@@ -7,8 -7,9 +7,9 @@@
  
  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_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty -8 38400')')m4_dnl
  m4_dnl
  [Unit]
  Description=Getty on %I