shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-09-16 17:45:52 +03:00
Code Activity

units: deal properly with the fact that agetty is called getty on Debian

Browse Source
This commit is contained in:
Lennart Poettering
2010-11-11 00:30:00 +01:00
parent b0734b235f
commit f54409d8b8
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
units/getty@.service.m4
View File

@@ -5,12 +5,12 @@
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
m4_ifdef(`TARGET_UBUNTU', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty')')m4_dnl
m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty')')m4_dnl
m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty -8 38400')')m4_dnl m4_ifdef(`TARGET_UBUNTU', `m4_define(`GETTY', `/sbin/getty')')m4_dnl
m4_dnl m4_dnl
[Unit] [Unit]
Description=Getty on %I Description=Getty on %I
@@ -30,7 +30,7 @@ Before=getty.target
[Service] [Service]
Environment=TERM=linux Environment=TERM=linux
ExecStart=-GETTY %I ExecStart=-GETTY %I 38400
Restart=always Restart=always
RestartSec=0 RestartSec=0
UtmpIdentifier=%I UtmpIdentifier=%I

9
units/serial-getty@.service.m4
View File

@@ -5,6 +5,13 @@
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. # (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] [Unit]
Description=Serial Getty on %I Description=Serial Getty on %I
BindTo=dev-%i.device BindTo=dev-%i.device
@@ -26,7 +33,7 @@ Environment=TERM=vt100-nav
m4_ifdef(`TARGET_FEDORA', m4_ifdef(`TARGET_FEDORA',
ExecStartPre=-/sbin/securetty %I ExecStartPre=-/sbin/securetty %I
)m4_dnl )m4_dnl
ExecStart=-/sbin/agetty -s %I 115200,38400,9600 ExecStart=-GETTY -s %I 115200,38400,9600
Restart=always Restart=always
RestartSec=0 RestartSec=0
UtmpIdentifier=%I UtmpIdentifier=%I