From f31f6e5fca75974adb1ae8300854916512b484bb Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 4 Jan 2019 11:12:55 +0100 Subject: [kiosk*] rework and introduce kiosk mode modules changed from slxbrowser only support to modular hook structure to support additional browser, i.e. chromium NOTE: kiosk-chromium and kiosk-netpoint only make sense with the new gen --- .../data/etc/systemd/system/kiosk-mode.target | 3 --- .../system/kiosk-mode.target.wants/graphical.target | 1 - .../system/kiosk-mode.target.wants/kiosk.service | 1 - .../slxbrowser/data/etc/systemd/system/kiosk.service | 8 -------- .../openslx/lightdm/autologin.d/00-check-slxbrowser | 10 ---------- .../slxbrowser/data/opt/openslx/scripts/kiosk-launch | 18 ------------------ .../data/opt/openslx/scripts/systemd-setup_kiosk | 20 -------------------- 7 files changed, 61 deletions(-) delete mode 100644 core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target delete mode 120000 core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target.wants/graphical.target delete mode 120000 core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target.wants/kiosk.service delete mode 100644 core/modules/slxbrowser/data/etc/systemd/system/kiosk.service delete mode 100644 core/modules/slxbrowser/data/opt/openslx/lightdm/autologin.d/00-check-slxbrowser delete mode 100755 core/modules/slxbrowser/data/opt/openslx/scripts/kiosk-launch delete mode 100755 core/modules/slxbrowser/data/opt/openslx/scripts/systemd-setup_kiosk (limited to 'core/modules/slxbrowser') diff --git a/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target b/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target deleted file mode 100644 index fb95249c..00000000 --- a/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Description=Kiosk mode - diff --git a/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target.wants/graphical.target b/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target.wants/graphical.target deleted file mode 120000 index 949b0756..00000000 --- a/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target.wants/graphical.target +++ /dev/null @@ -1 +0,0 @@ -../graphical.target \ No newline at end of file diff --git a/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target.wants/kiosk.service b/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target.wants/kiosk.service deleted file mode 120000 index a6e3a110..00000000 --- a/core/modules/slxbrowser/data/etc/systemd/system/kiosk-mode.target.wants/kiosk.service +++ /dev/null @@ -1 +0,0 @@ -../kiosk.service \ No newline at end of file diff --git a/core/modules/slxbrowser/data/etc/systemd/system/kiosk.service b/core/modules/slxbrowser/data/etc/systemd/system/kiosk.service deleted file mode 100644 index dba49864..00000000 --- a/core/modules/slxbrowser/data/etc/systemd/system/kiosk.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Prepare KIOSK mode -Before=display-manager.service kdm.service lightdm.service - -[Service] -ExecStart=/opt/openslx/scripts/systemd-setup_kiosk -RemainAfterExit=true - diff --git a/core/modules/slxbrowser/data/opt/openslx/lightdm/autologin.d/00-check-slxbrowser b/core/modules/slxbrowser/data/opt/openslx/lightdm/autologin.d/00-check-slxbrowser deleted file mode 100644 index 4fe45c02..00000000 --- a/core/modules/slxbrowser/data/opt/openslx/lightdm/autologin.d/00-check-slxbrowser +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/ash -# This file is SOURCED - -# Kiosk mode? -if [ -n "$SLX_BROWSER_URL" ]; then - exec /opt/openslx/scripts/kiosk-launch -fi - -true - diff --git a/core/modules/slxbrowser/data/opt/openslx/scripts/kiosk-launch b/core/modules/slxbrowser/data/opt/openslx/scripts/kiosk-launch deleted file mode 100755 index 566bbb16..00000000 --- a/core/modules/slxbrowser/data/opt/openslx/scripts/kiosk-launch +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/ash - -. /opt/openslx/config - -[ -z "$SLX_BROWSER_URL" ] && exit 1 - -xset s off -xset -dpms - -openbox & - -[ -n "$SLX_BROWSER_INSECURE" ] && SLX_BROWSER_INSECURE="--insecure" -RELOAD= -[ -n "$SLX_BROWSER_RELOAD_SECS" ] && [ "$SLX_BROWSER_RELOAD_SECS" -gt 0 ] && RELOAD="--reload-interval $SLX_BROWSER_RELOAD_SECS" - -xdotool mousemove 20000 20000 & -exec slxbrowser $SLX_BROWSER_INSECURE $RELOAD --fullscreen "$SLX_BROWSER_URL" - diff --git a/core/modules/slxbrowser/data/opt/openslx/scripts/systemd-setup_kiosk b/core/modules/slxbrowser/data/opt/openslx/scripts/systemd-setup_kiosk deleted file mode 100755 index b8761aab..00000000 --- a/core/modules/slxbrowser/data/opt/openslx/scripts/systemd-setup_kiosk +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/ash - -# Autologin -sed -i '/^AutoLoginDelay=/d;/^AutoLoginUser=/d;s/^AutoLoginEnable=.*$/AutoLoginEnable=true\nAutoLoginUser=demo\nAutoLoginDelay=0/' "/etc/kde4/kdm/kdmrc" - -# Disable logout delay for demo user on shutdown/reboot/... -mkdir -p "/run/openslx" -touch "/run/openslx/demo-no-logout-delay" - -# desktop session -cat > /opt/openslx/xsessions/default.desktop <