diff options
| author | Tollef Fog Heen <tfheen@err.no> | 2011-02-16 21:14:49 +0100 |
|---|---|---|
| committer | Tollef Fog Heen <tfheen@err.no> | 2011-02-16 21:14:49 +0100 |
| commit | c7b3ac9cfdddd494fd48196bbd0219b065afdcd4 (patch) | |
| tree | 23a8f706cb391ceb4064978305b5b5a2c9fb2c82 | |
| parent | 860ce4af64d9c59d1cb75641f7417dcdb3bb15c0 (diff) | |
| download | systemd-c7b3ac9cfdddd494fd48196bbd0219b065afdcd4.tar.gz | |
Fix up mismerge17-1
Some bits of the serial-getty@.service.m4 didn't get merged
correctly. Fix that.
| -rw-r--r-- | units/serial-getty@.service.m4 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 index b3bc37ed2a..c7a11b1fa0 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 |