From f55f2fc94a11ac32ffa4a9ca7a50fb704735170a Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Thu, 13 Apr 2023 18:50:27 +0100 Subject: [PATCH] bin/console-conf-wrapper: prefer use of snapd/modeenv when determining snapd mode Signed-off-by: Ondrej Kubik --- bin/console-conf-wrapper | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/console-conf-wrapper b/bin/console-conf-wrapper index b5326665..77561522 100755 --- a/bin/console-conf-wrapper +++ b/bin/console-conf-wrapper @@ -22,7 +22,14 @@ if [ -e /run/snapd-recovery-chooser-triggered ]; then fi fi -if grep -q 'snapd_recovery_mode=install' /proc/cmdline ; then +# always prefer to use modeevn if it is available +if [ -e "/var/lib/snapd/modeenv" ]; then + mode="$(sed -n 's/mode=\([^[:space:]]*\)/\1/p' /var/lib/snapd/modeenv)" +else + mode="$(sed 's/.*snapd_recovery_mode=\([^[:space:]]*\)[[:space:]].*/\1/' /proc/cmdline))" +fi + +if [ "${mode}" = "install" ]; then echo "Installing the system, please wait for reboot" # XXX: replace with something more user friendly after the beta? journalctl -u snapd.service -f