summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-14 23:26:53 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-14 23:48:20 +0100
commit92ab323c824300683efb11fd43c9d834cea9b9e6 (patch)
treec9418d77deced6b8aaf1397db488112263e4b81d /units
parent41242c42bfe9b11865a8ceacc021d6a452e671c0 (diff)
units: make use of agetty mandatory
Diffstat (limited to 'units')
-rw-r--r--units/getty@.service.m49
-rw-r--r--units/serial-getty@.service.m49
2 files changed, 2 insertions, 16 deletions
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 24247be7a7..11a71d7168 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -5,13 +5,6 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
-m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
-m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
-m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
-m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty')')m4_dnl
-m4_ifdef(`TARGET_UBUNTU', `m4_define(`GETTY', `/sbin/getty')')m4_dnl
-m4_dnl
[Unit]
Description=Getty on %I
BindTo=dev-%i.device
@@ -30,7 +23,7 @@ Before=getty.target
[Service]
Environment=TERM=linux
-ExecStart=-GETTY %I 38400
+ExecStart=-/sbin/agetty %I 38400
Restart=always
RestartSec=0
UtmpIdentifier=%I
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index a8610c809a..da9bd1946b 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -5,13 +5,6 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
-m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
-m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
-m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
-m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty')')m4_dnl
-m4_ifdef(`TARGET_UBUNTU', `m4_define(`GETTY', `/sbin/getty')')m4_dnl
-m4_dnl
[Unit]
Description=Serial Getty on %I
BindTo=dev-%i.device
@@ -33,7 +26,7 @@ Environment=TERM=vt100-nav
m4_ifdef(`TARGET_FEDORA',
ExecStartPre=-/sbin/securetty %I
)m4_dnl
-ExecStart=-GETTY -s %I 115200,38400,9600
+ExecStart=-/sbin/agetty -s %I 115200,38400,9600
Restart=always
RestartSec=0
UtmpIdentifier=%I