From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 16 Feb 2011 20:14:49 +0000 (+0100)
Subject: Fix up mismerge
X-Git-Tag: 17-1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8693f7118b195c9dd852ca47a08ea7ad1c12f233;p=systemd

Fix up mismerge

Some bits of the serial-getty@.service.m4 didn't get merged
correctly.  Fix that.
---

diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index b3bc37ed..c7a11b1f 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -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