merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)

4 files changed, 60 insertions, 0 deletions

diff --git a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
new file mode 100755
index 00000000..fc6588ae
--- /dev/null
+++ b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
@@ -0,0 +1,33 @@
+#!/bin/ash
+
+if which xscreensaver; then
+	[ -z "$UID" ] && UID=$(id -u)
+	[ -z "$HOME" ] && HOME="$(getent passwd "$UID" | head -n 1 | awk -F ':' '{print $6}')"
+	if ! [ -s "$HOME/.xscreensaver" ]; then
+		. /opt/openslx/config
+		NUM=${SLX_SCREEN_STANDBY_TIMEOUT}
+		if [ -n "$NUM" ] && [ "$NUM" -gt 60 ]; then
+			SECS=0$(( NUM % 60 ))
+			MINS=0$(( ( NUM / 60 ) % 60 ))
+			HRS=0$(( ( NUM / 3600 ) % 60 ))
+			STANDBY="${HRS:$(( ${#HRS} - 2 )):2}:${MINS:$(( ${#MINS} - 2 )):2}:${SECS:$(( ${#SECS} - 2 )):2}"
+		else
+			STANDBY=0:00:00
+		fi
+		cat > "$HOME/.xscreensaver" <<EOF
+mode:         blank
+timeout:      24:00:00
+lock:         True
+lockTimeout:  0:00:10
+fade:         False
+unfade:       False
+dpmsEnabled:  True
+dpmsStandby:  $STANDBY
+dpmsSuspend:  $STANDBY
+dpmsOff:      $STANDBY
+EOF
+	fi
+	xscreensaver -no-splash &
+fi
+true
+
diff --git a/core/modules/xscreensaver/module.build b/core/modules/xscreensaver/module.build
new file mode 100644
index 00000000..435a7b10
--- /dev/null
+++ b/core/modules/xscreensaver/module.build
@@ -0,0 +1,13 @@
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	list_packet_files > "$COPYLIST"
+	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+}
+
+post_copy() {
+	:
+}
diff --git a/core/modules/xscreensaver/module.conf b/core/modules/xscreensaver/module.conf
new file mode 100644
index 00000000..2134f0cb
--- /dev/null
+++ b/core/modules/xscreensaver/module.conf
@@ -0,0 +1,8 @@
+REQUIRED_BINARIES="
+	xscreensaver
+	xscreensaver-command
+"
+REQUIRED_LIBRARIES=""
+REQUIRED_DIRECTORIES="
+	/etc/pam.d/
+"
diff --git a/core/modules/xscreensaver/module.conf.ubuntu b/core/modules/xscreensaver/module.conf.ubuntu
new file mode 100644
index 00000000..b25b886f
--- /dev/null
+++ b/core/modules/xscreensaver/module.conf.ubuntu
@@ -0,0 +1,6 @@
+REQUIRED_CONTENT_PACKAGES="
+	xscreensaver
+"
+REQUIRED_INSTALLED_PACKAGES="
+	xscreensaver
+"