Merge ~dilyn-corner/chromium-browser/+git/snap-from-source:daemon into ~chromium-team/chromium-browser/+git/snap-from-source:daemon

[Dilyn]

Remove the profile lock when the kiosk starts.

Chromium creates a profile lock file to track whether or not a profile is in-use to avoid profile corruption. Chromium has code to safely cleaning this file [1], but part of that handling can involve manual intervention from the user in the form of a pop-up window asking if it is safe to unlock the profile. Manual intervention is undesirable on a device acting as a kiosk, and because the kiosk is managed as a daemon by snapd the profile should not be in-use.

[1] https://chromium.googlesource.com/chromium/src/+/master/chrome/browser/process_singleton_posix.cc

Signed-off-by: Dilyn Corner <email address hidden>

[Nathan Teodosio (nteodosio)]

Thanks!

review: Approve

diff --git a/launcher/daemon.wrapper b/launcher/daemon.wrapper
index 1724efd..0e4a2a3 100755
--- a/launcher/daemon.wrapper
+++ b/launcher/daemon.wrapper
@@ -14,4 +14,13 @@ ln -sf "${real_wayland}.lock" "$XDG_RUNTIME_DIR"
 
 unset DISPLAY
 
+# Chromium creates a file with a unique name which indicates whether or not the
+# requested profile is in-use by some other chromium process. Chromium is
+# supposed to clean up after itself, but sometimes this lock file persists.
+# Because we are running Chromium as a kiosk, it is safe to manually remove this
+# file - the profile should not be in use.
+if [ -e "$SNAP_USER_COMMON/chromium/SingletonLock" ]; then
+    unlink "$SNAP_USER_COMMON/chromium/SingletonLock"
+fi
+
 exec "$@"