diff options
| author | Simon Rettberg | 2021-02-09 19:25:23 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2021-02-09 19:25:23 +0100 |
| commit | ce4bc5ca8799cd438e91b9af835cfc4396abed0e (patch) | |
| tree | 05dfb92604b22e397d2d7d3fecc9a9b4bf78f04e | |
| parent | [hardware-stats] Add ID45 to status updates (diff) | |
| download | mltk-ce4bc5ca8799cd438e91b9af835cfc4396abed0e.tar.gz mltk-ce4bc5ca8799cd438e91b9af835cfc4396abed0e.tar.xz mltk-ce4bc5ca8799cd438e91b9af835cfc4396abed0e.zip | |
[kiosk-common/kiosk-chromium] Add system certs to cert store
References #3418
| -rw-r--r-- | core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium | 6 | ||||
| -rwxr-xr-x | core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch | 2 |
2 files changed, 8 insertions, 0 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..a98332df 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() { @@ -136,5 +139,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[@]}" diff --git a/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch b/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch index 79f08e3d..8525d2f2 100755 --- a/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch +++ b/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch @@ -7,6 +7,8 @@ export PATH="$PATH:/opt/openslx/sbin:/opt/openslx/bin" [ -z "$SLX_BROWSER_URL" ] && exit 1 +. /opt/openslx/bin/slx-tools + # disable power management features xset s off xset -dpms |