diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-07-19 10:37:05 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-07-28 21:30:53 +0200 |
| commit | 219fa78b5fa2ec9c13dd87419366116e3197693f (patch) | |
| tree | 51d93da38664ef14bbe8ca4aaf674051ce1e6657 /units | |
| parent | 71ec216e86173b5705772730c06d6ccaa16d598a (diff) | |
| download | systemd-219fa78b5fa2ec9c13dd87419366116e3197693f.tar.gz | |
units: Simplify container getty handling
Let's remove the baud settings for the container getty units since
they don't have any effect there anyway. On top of that, when we're
dealing with container TTYs, we can handle all the setup involved
ourselves so let's prevent agetty/login from touching the container
tty at all.
One example where this helps is that it actually makes disabling
TTYVHangup have an effect since before, login would unconditionally
call vhangup() on the tty.
Diffstat (limited to 'units')
| -rw-r--r-- | units/console-getty.service.in | 5 | ||||
| -rw-r--r-- | units/container-getty@.service.in | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/units/console-getty.service.in b/units/console-getty.service.in index 73871d6f50..606b7dbe16 100644 --- a/units/console-getty.service.in +++ b/units/console-getty.service.in @@ -20,9 +20,8 @@ Before=getty.target ConditionPathExists=/dev/console [Service] -# The '-o' option value tells agetty to replace 'login' arguments with an -# option to preserve environment (-p), followed by '--' for safety, and then -# the entered username. +# The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p), +# followed by '--' for safety, and then the entered username. ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM Type=idle Restart=always diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in index a6e3f94e2a..8d7e20d5ec 100644 --- a/units/container-getty@.service.in +++ b/units/container-getty@.service.in @@ -25,10 +25,9 @@ Conflicts=rescue.service Before=rescue.service [Service] -# The '-o' option value tells agetty to replace 'login' arguments with an -# option to preserve environment (-p), followed by '--' for safety, and then -# the entered username. -ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM +# The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p), +# followed by '--' for safety, and then the entered username. +ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM Type=idle Restart=always RestartSec=0 |