diff options
| author | Will Woods <wwoods@redhat.com> | 2012-03-21 20:02:44 -0400 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2012-03-21 21:10:08 -0700 |
| commit | babdb092ff02a6ce2300105b9e17734c82edb7ed (patch) | |
| tree | 80a253676ba05b0ceded6e9293042cc169bdfda3 /data/systemd/anaconda-shell@.service | |
| parent | ec2655b31b272dbc181ceb9ee663e858e8bda308 (diff) | |
| download | anaconda-babdb092ff02a6ce2300105b9e17734c82edb7ed.tar.gz anaconda-babdb092ff02a6ce2300105b9e17734c82edb7ed.tar.xz anaconda-babdb092ff02a6ce2300105b9e17734c82edb7ed.zip | |
Let systemd handle terminal setup, fix possible race with NM
Add a systemd-generator script that puts anaconda on the correct console
tty, then puts shells on tty2 and the first virtualization console
(unless we're using it for anaconda).
Adding "TTYPath" to the systemd services means systemd takes care of
setting up all the terminal stuff - picking the right TERM value,
setting the keyboard mode to K_UNICODE, and all that esoteric weirdness.
Also, move anaconda's dependencies into anaconda.target, and make
anaconda start *after* anaconda.target, just so we can be sure that e.g.
NetworkManager is active before anaconda starts.
(as a bonus, it also shuts off plymouth correctly, just in case we ever
want to have a anaconda-specific bootsplash)
Diffstat (limited to 'data/systemd/anaconda-shell@.service')
| -rw-r--r-- | data/systemd/anaconda-shell@.service | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/systemd/anaconda-shell@.service b/data/systemd/anaconda-shell@.service index ad2141ee0..52bed74b5 100644 --- a/data/systemd/anaconda-shell@.service +++ b/data/systemd/anaconda-shell@.service @@ -6,14 +6,13 @@ BindTo=dev-%i.device After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service [Service] -Environment=TERM=linux WorkingDirectory=/ ExecStart=-/sbin/agetty -n -l /bin/bash -o '--login' %I 38400 Restart=always RestartSec=0 -TimeoutSec=0 -TTYPath=/dev/%i +TTYPath=/dev/%I TTYReset=yes TTYVHangup=yes TTYVTDisallocate=yes +KillMode=process KillSignal=SIGHUP |