shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-18 10:04:04 +03:00
Code

emergency: make sure console password agents don't interfere with the emergency shell

Browse Source 
If for any reason local-fs.target fails at startup while a password is
requested by systemd-cryptsetup@.service, we end up with the emergency shell
competing with systemd-ask-password-console.service for the console.

This patch makes sure that:

 - systemd-ask-password-console.service is stopped before entering in emergency
   mode so it won't make any access to the console while the emergency shell is
   running.

 - systemd-ask-password-console.path is also stopped so any attempts to restart
   systemd-cryptsetup in the emergency shell won't restart
   systemd-ask-password-console.service and kill the emergency shell.

 - systemd-ask-password-wall.path is stopped so
   systemd-ask-password-wall.service won't be started as this service pulls
   the default dependencies in.

Fixes: #10131
This commit is contained in:
Franck Bui 2018-09-25 15:25:08 +02:00 committed by Lennart Poettering
parent 89f180201c
commit 4885626b56
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
units/systemd-ask-password-console.path
View File

@ -11,7 +11,7 @@
Description=Dispatch Password Requests to Console Directory Watch Description=Dispatch Password Requests to Console Directory Watch
Documentation=man:systemd-ask-password-console.service(8) Documentation=man:systemd-ask-password-console.service(8)
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target emergency.service
After=plymouth-start.service After=plymouth-start.service
Before=paths.target shutdown.target cryptsetup.target Before=paths.target shutdown.target cryptsetup.target
ConditionPathExists=!/run/plymouth/pid ConditionPathExists=!/run/plymouth/pid

2
units/systemd-ask-password-console.service.in
View File

@ -11,7 +11,7 @@
Description=Dispatch Password Requests to Console Description=Dispatch Password Requests to Console
Documentation=man:systemd-ask-password-console.service(8) Documentation=man:systemd-ask-password-console.service(8)
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target emergency.service
After=plymouth-start.service systemd-vconsole-setup.service After=plymouth-start.service systemd-vconsole-setup.service
Before=shutdown.target Before=shutdown.target
ConditionPathExists=!/run/plymouth/pid ConditionPathExists=!/run/plymouth/pid

2
units/systemd-ask-password-wall.path
View File

@ -11,7 +11,7 @@
Description=Forward Password Requests to Wall Directory Watch Description=Forward Password Requests to Wall Directory Watch
Documentation=man:systemd-ask-password-console.service(8) Documentation=man:systemd-ask-password-console.service(8)
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target emergency.service
Before=paths.target shutdown.target cryptsetup.target Before=paths.target shutdown.target cryptsetup.target
[Path] [Path]