debian/console-conf.*.service: run after snapd.recovery-chooser-trigger.service

On Core20 devices, the user may decice to invoke a recovery chooser by holding
down a specific key. Make sure that the recovery chooser trigger detection
service runs before, so that by the time console-conf runs, the trigger
detection window is closed and we may launch the chooser if needed.

Note, the patch only includes the bits for ensuring the correct order during
boot.

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
This commit is contained in:
Maciek Borzecki 2020-02-25 11:11:36 +01:00
parent 06f528bb7f
commit 3e14aa2ae5
2 changed files with 6 additions and 0 deletions

View File

@ -5,6 +5,9 @@ After=rc-local.service
# on core20 the firstboot seeding happens via the core.start-snapd service,
# make sure to start after so that the 'snap' command is available
After=core.start-snapd.service
# on core20 the user may invoke a recovery chooser, make sure the detection
# service runs before
After=snapd.recovery-chooser-trigger.service
IgnoreOnIsolate=yes
ConditionPathExists=/dev/tty0
ConditionPathExists=!/var/lib/console-conf/complete

View File

@ -6,6 +6,9 @@ After=rc-local.service
# on core20 the firstboot seeding happens via the core.start-snapd service,
# make sure to start after so that the 'snap' command is available
After=core.start-snapd.service
# on core20 the user may invoke a recovery chooser, make sure the detection
# service runs before
After=snapd.recovery-chooser-trigger.service
ConditionPathExists=!/var/lib/console-conf/complete
StartLimitInterval=0