diff options
| author | Will Woods <wwoods@redhat.com> | 2011-09-20 13:45:43 -0400 |
|---|---|---|
| committer | Will Woods <wwoods@redhat.com> | 2011-09-21 23:40:07 -0400 |
| commit | ff0d7f401164a160d8b819bf70c89072d73744b9 (patch) | |
| tree | e02a56bedad47c9f9d2f2d99735c5e271aae763f /data | |
| parent | 09ff3b03d7c7b3fb90002dbf0fe02b343fdeee34 (diff) | |
| download | anaconda-ff0d7f401164a160d8b819bf70c89072d73744b9.tar.gz anaconda-ff0d7f401164a160d8b819bf70c89072d73744b9.tar.xz anaconda-ff0d7f401164a160d8b819bf70c89072d73744b9.zip | |
make anaconda-shell.service a template, put it on tty2 & hvc1
We're also passing "-l /bin/bash -o '--login'", which does the no-login
thing for us, so we can remove the silly hack where we replace
/bin/login with a shell script that runs bash.
Diffstat (limited to 'data')
| -rw-r--r-- | data/systemd/anaconda-shell.service | 12 | ||||
| -rw-r--r-- | data/systemd/anaconda.target | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/data/systemd/anaconda-shell.service b/data/systemd/anaconda-shell.service index 8d411464f..d845cde22 100644 --- a/data/systemd/anaconda-shell.service +++ b/data/systemd/anaconda-shell.service @@ -1,16 +1,18 @@ +# anaconda-shell@.service +# This is roughly equivalent to getty@.service, except we go straight to bash [Unit] -Description=Shell on tty2 -BindTo=dev-tty2.device -After=dev-tty2.device +Description=Shell on %I +BindTo=dev-%i.device +After=dev-%i.device [Service] Environment=TERM=linux WorkingDirectory=/ -ExecStart=-/sbin/agetty -n tty2 38400 +ExecStart=-/sbin/agetty -n -l /bin/bash -o '--login' %I 38400 Restart=always RestartSec=0 TimeoutSec=0 -TTYPath=/dev/tty2 +TTYPath=/dev/%i TTYReset=yes TTYVHangup=yes TTYVTDisallocate=yes diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target index 18863992d..ac6d6e132 100644 --- a/data/systemd/anaconda.target +++ b/data/systemd/anaconda.target @@ -4,3 +4,4 @@ Requires=basic.target Conflicts=rescue.service rescue.target After=basic.target rescue.service rescue.target AllowIsolate=yes +Wants=anaconda-shell@tty2.service anaconda-shell@hvc1.service |