Merge branch 'master' into debian

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

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