From 1d6c61cc5b2aab87d96425cf7209d7567f13bc56 Mon Sep 17 00:00:00 2001 From: Chris Guida Date: Thu, 1 Dec 2022 17:41:08 -0600 Subject: [PATCH] wait for monitor to be attached before launching firefox (#2005) * wait for monitor to be attached before launching firefox * add code to kill firefox on monitor disconnect * fix detection for the pi * Remove Pi only logic * chore: Remove the kiosk mode Co-authored-by: Aiden McClelland Co-authored-by: J M <2364004+Blu-J@users.noreply.github.com> Co-authored-by: BluJ --- build/lib/scripts/check-monitor | 8 ++++++++ build/lib/scripts/enable-kiosk | 9 +++++++++ build/raspberry-pi/initialization.sh | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 build/lib/scripts/check-monitor diff --git a/build/lib/scripts/check-monitor b/build/lib/scripts/check-monitor new file mode 100755 index 000000000..3ff787180 --- /dev/null +++ b/build/lib/scripts/check-monitor @@ -0,0 +1,8 @@ +#!/bin/sh + + +if cat /sys/class/drm/*/status | grep -qw connected; then + exit 0 +else + exit 1 +fi diff --git a/build/lib/scripts/enable-kiosk b/build/lib/scripts/enable-kiosk index 453fb6fde..9bf557be2 100755 --- a/build/lib/scripts/enable-kiosk +++ b/build/lib/scripts/enable-kiosk @@ -57,6 +57,15 @@ EOT while ! curl "http://localhost" > /dev/null; do sleep 1 done +while ! /usr/lib/embassy/scripts/check-monitor; do + sleep 15 +done +( + while /usr/lib/embassy/scripts/check-monitor; do + sleep 15 + done + killall firefox-esr +) & matchbox-window-manager -use_titlebar no & firefox-esr http://localhost --profile $PROFILE rm -rf $PROFILE diff --git a/build/raspberry-pi/initialization.sh b/build/raspberry-pi/initialization.sh index 59ed2d275..c976ab56f 100755 --- a/build/raspberry-pi/initialization.sh +++ b/build/raspberry-pi/initialization.sh @@ -44,7 +44,7 @@ systemctl stop tor systemctl enable embassyd.service embassy-init.service -. /usr/lib/embassy/scripts/enable-kiosk +# . /usr/lib/embassy/scripts/enable-kiosk sed -i 's/^/usb-storage.quirks=152d:0562:u,14cd:121c:u,0781:cfcb:u /g' /boot/cmdline.txt