]> err.no Git - systemd/commitdiff
Fix up mismerge 17-1
authorTollef Fog Heen <tfheen@err.no>
Wed, 16 Feb 2011 20:14:49 +0000 (21:14 +0100)
committerTollef Fog Heen <tfheen@err.no>
Wed, 16 Feb 2011 20:14:49 +0000 (21:14 +0100)
Some bits of the serial-getty@.service.m4 didn't get merged
correctly.  Fix that.

units/serial-getty@.service.m4

index b3bc37ed2a05cde86f1269fba6c0a2c57b1d34f1..c7a11b1fa0c987e4d81df2e81a4013e6a6448da0 100644 (file)
@@ -23,9 +23,6 @@ Before=getty.target
 
 [Service]
 Environment=TERM=vt100
-m4_ifdef(`TARGET_FEDORA',
-ExecStartPre=-/sbin/securetty %I
-)m4_dnl
 ExecStart=-/sbin/agetty -s %I 115200,38400,9600
 Restart=always
 RestartSec=0