Merge pull request #770 from bboozzoo/bboozzoo/run-chooser-when-disabled

console-conf: always run when triggered for the chooser

bin/console-conf-wrapper

@@ -17,6 +17,9 @@ if [ -e /run/snapd-recovery-chooser-triggered ]; then
         # when recovery chooser is invoked it takes over the terminal
         exec /usr/lib/snapd/snap-recovery-chooser
     fi
+    if [ -e /var/lib/console-conf/complete ]; then
+        exit 0
+    fi
 fi
 
 if grep -q 'snapd_recovery_mode=install' /proc/cmdline ; then

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]