summaryrefslogtreecommitdiffstats
path: root/core/modules
diff options
context:
space:
mode:
authorSimon Rettberg2024-11-22 10:53:49 +0100
committerSimon Rettberg2024-11-22 10:53:49 +0100
commitd795d28300c60bda6b2fb6fbf8b37185c773ca8d (patch)
tree45df609935c8fcacf3547f595872da37118295c8 /core/modules
parent[kiosk-chromium] Preload: Simply use cat (diff)
downloadmltk-d795d28300c60bda6b2fb6fbf8b37185c773ca8d.tar.gz
mltk-d795d28300c60bda6b2fb6fbf8b37185c773ca8d.tar.xz
mltk-d795d28300c60bda6b2fb6fbf8b37185c773ca8d.zip
[kiosk-chromium/kiosk-firefox] Add log messages to preload scripts
Diffstat (limited to 'core/modules')
-rw-r--r--core/modules/kiosk-chromium/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-chromium9
-rw-r--r--core/modules/kiosk-firefox/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-firefox12
2 files changed, 17 insertions, 4 deletions
diff --git a/core/modules/kiosk-chromium/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-chromium b/core/modules/kiosk-chromium/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-chromium
index 26e83b1b..bb9d69f9 100644
--- a/core/modules/kiosk-chromium/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-chromium
+++ b/core/modules/kiosk-chromium/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-chromium
@@ -7,6 +7,11 @@
. /opt/openslx/config
if [ "${SLX_BROWSER//chromium/}" != "$SLX_BROWSER" ]; then
- cat /usr/lib/chromium-browser/chromium-browser &> /dev/null &
- cat /usr/lib/chromium/chromium &> /dev/null &
+ echo "Preloading Chromium files"
+ (
+ cat /usr/lib/chromium-browser/chromium-browser &> /dev/null &
+ cat /usr/lib/chromium/chromium &> /dev/null &
+ wait
+ echo "Finished preloading Chromium"
+ ) &
fi
diff --git a/core/modules/kiosk-firefox/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-firefox b/core/modules/kiosk-firefox/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-firefox
index 01bf4125..05a8e35a 100644
--- a/core/modules/kiosk-firefox/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-firefox
+++ b/core/modules/kiosk-firefox/data/opt/openslx/scripts/systemd-setup_kiosk.d/00-preload-firefox
@@ -7,11 +7,19 @@
. /opt/openslx/config
if [ "${SLX_BROWSER//firefox/}" != "$SLX_BROWSER" ]; then
+ echo "Preloading Firefox files"
for dir in /lib/firefox /usr/lib/firefox /lib/firefox-esr /usr/lib/firefox-esr; do
[ -d "$dir" ] || continue
+ ok=
for i in firefox firefox-esr libxul.so omni.ja; do
+ [ -s "$dir/$i" ] || continue
+ ok=1
cat "$dir/$i" &> /dev/null &
done
- break
- done
+ if [ -n "$ok" ]; then
+ wait
+ echo "Finished preloading Firefox"
+ break
+ fi
+ done &
fi