From 3e14aa2ae5fc8f711bf0ed80ad5edf1d0c4e5f99 Mon Sep 17 00:00:00 2001 From: Maciek Borzecki Date: Tue, 25 Feb 2020 11:11:36 +0100 Subject: [PATCH] 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 --- debian/console-conf.console-conf@.service | 3 +++ debian/console-conf.serial-console-conf@.service | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/console-conf.console-conf@.service b/debian/console-conf.console-conf@.service index 46632de3..8d80993f 100644 --- a/debian/console-conf.console-conf@.service +++ b/debian/console-conf.console-conf@.service @@ -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 diff --git a/debian/console-conf.serial-console-conf@.service b/debian/console-conf.serial-console-conf@.service index 93c40a9b..abd61178 100644 --- a/debian/console-conf.serial-console-conf@.service +++ b/debian/console-conf.serial-console-conf@.service @@ -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