From 06de80cf601c228bf949e0409aafa6b825c1ea03 Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Wed, 13 May 2020 18:24:27 +0200 Subject: [PATCH] debian/console-conf@.service: use triggering conditions, make recovery marker file one Use triggering conditions for controlling when console-conf should run. We effectively want it to start if there is no /var/lib/console-conf/complete file *or* the snapd recovery marker file exists. Signed-off-by: Maciej Borzecki --- debian/console-conf.console-conf@.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/console-conf.console-conf@.service b/debian/console-conf.console-conf@.service index bec8e483..373222f4 100644 --- a/debian/console-conf.console-conf@.service +++ b/debian/console-conf.console-conf@.service @@ -10,7 +10,8 @@ After=core18.start-snapd.service core.start-snapd.service After=snapd.recovery-chooser-trigger.service IgnoreOnIsolate=yes ConditionPathExists=/dev/tty0 -ConditionPathExists=!/var/lib/console-conf/complete +ConditionPathExists=|!/var/lib/console-conf/complete +ConditionPathExists=|/run/snapd-recovery-chooser-triggered StartLimitInterval=0 [Service]