summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-11 00:30:00 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-11 00:30:00 +0100
commitf54409d8b8a8dd3e43a450be5bbd78afdcb78c25 (patch)
tree67778b73404c05f94e5ac2123d39a7be820e6d24 /units
parentb0734b235f47238148253ace6a887151e3721d29 (diff)
units: deal properly with the fact that agetty is called getty on Debian
Diffstat (limited to 'units')
-rw-r--r--units/getty@.service.m414
-rw-r--r--units/serial-getty@.service.m49
2 files changed, 15 insertions, 8 deletions
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index b71e7f4ed4..24247be7a7 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -5,12 +5,12 @@
# 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 38400')')m4_dnl
-m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl
-m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl
-m4_ifdef(`TARGET_UBUNTU', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl
-m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl
-m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty -8 38400')')m4_dnl
+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
@@ -30,7 +30,7 @@ Before=getty.target
[Service]
Environment=TERM=linux
-ExecStart=-GETTY %I
+ExecStart=-GETTY %I 38400
Restart=always
RestartSec=0
UtmpIdentifier=%I
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index da9bd1946b..a8610c809a 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -5,6 +5,13 @@
# 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
@@ -26,7 +33,7 @@ Environment=TERM=vt100-nav
m4_ifdef(`TARGET_FEDORA',
ExecStartPre=-/sbin/securetty %I
)m4_dnl
-ExecStart=-/sbin/agetty -s %I 115200,38400,9600
+ExecStart=-GETTY -s %I 115200,38400,9600
Restart=always
RestartSec=0
UtmpIdentifier=%I