From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 13 Feb 2011 07:29:23 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: 17-1~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f68f4eb2fdaab3c1cde76310dac0a90b70df4fce;p=systemd

Merge branch 'master' into debian

Conflicts:
	units/serial-getty@.service.m4
---

f68f4eb2fdaab3c1cde76310dac0a90b70df4fce
diff --cc units/serial-getty@.service.m4
index b214a73f,c7a11b1f..b3bc37ed
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@@ -23,10 -23,7 +23,10 @@@ Before=getty.targe
  
  [Service]
  Environment=TERM=vt100
 +m4_ifdef(`TARGET_FEDORA',
 +ExecStartPre=-/sbin/securetty %I
 +)m4_dnl
- ExecStart=-/sbin/agetty %I 115200,38400,9600
+ ExecStart=-/sbin/agetty -s %I 115200,38400,9600
  Restart=always
  RestartSec=0
  UtmpIdentifier=%I