summaryrefslogtreecommitdiffstats
path: root/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
diff options
context:
space:
mode:
Diffstat (limited to 'core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium')
-rw-r--r--core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium29
1 files changed, 6 insertions, 23 deletions
diff --git a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
index cf9246a8..bb4204e0 100644
--- a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
+++ b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
@@ -9,6 +9,9 @@ if [ "$(whoami)" = "demo" ]; then
mkdir -p "$HOME/.config/chromium/Default"
fi
+cert_to_nssdb /etc/ssl/certs/ "${HOME}/.pki/nssdb" &
+nss_pid=$!
+
# Helper to decode URL-encoded strings
# e.g. urldecode http%3A%2F%2Ffoobar.com -> http://foobar.com
urldecode() {
@@ -72,29 +75,6 @@ if [ -z "$SLX_BROWSER_INTERACTIVE" ]; then
# Autologin active, go full fullscreen
chromium_args+=("--kiosk")
fi
-
- # swallow keyboard shortcuts of chromium
- cat <<- EOF > "$HOME/.xbindkeysrc"
- "true"
- Control+d
- "true"
- Control+t
- "true"
- Control+s
- "true"
- Control+n
- "true"
- Control+j
- "true"
- Control+p
- "true"
- Control+h
- "true"
- Control+Shift+o
- EOF
- # xbinkeys requires a daemon, run it
- xbindkeys_autostart &
-
fi
if [ -n "$SLX_BROWSER_RELOAD_SECS" ] && [ "$SLX_BROWSER_RELOAD_SECS" -gt 0 ]; then
@@ -136,5 +116,8 @@ if [ -n "$SLX_BROWSER_INSECURE" ]; then
chromium_args+=("--allow-running-insecure-content" "--ignore-certificate-errors")
fi
+# Wait until cert store is fully populated
+wait $nss_pid
+
# finally exec to chromium
exec chromium-browser "${chromium_args[@]}"