Merge branch 'master' of 10.4.9.56:/root/tm-scripts

7 files changed, 37 insertions, 6 deletions

diff --git a/remote/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver b/remote/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
new file mode 100755
index 00000000..385a8280
--- /dev/null
+++ b/remote/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
@@ -0,0 +1,8 @@
+#!/bin/ash
+
+if ! which xscreensaver; then
+	echo "Failed to find xscreensaver in '$PATH'!"
+	return 1
+fi
+
+xscreensaver -no-splash &
diff --git a/remote/modules/xscreensaver/module.build b/remote/modules/xscreensaver/module.build
new file mode 100644
index 00000000..435a7b10
--- /dev/null
+++ b/remote/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/remote/modules/xscreensaver/module.conf b/remote/modules/xscreensaver/module.conf
new file mode 100644
index 00000000..2134f0cb
--- /dev/null
+++ b/remote/modules/xscreensaver/module.conf
@@ -0,0 +1,8 @@
+REQUIRED_BINARIES="
+	xscreensaver
+	xscreensaver-command
+"
+REQUIRED_LIBRARIES=""
+REQUIRED_DIRECTORIES="
+	/etc/pam.d/
+"
diff --git a/remote/modules/xscreensaver/module.conf.ubuntu b/remote/modules/xscreensaver/module.conf.ubuntu
new file mode 100644
index 00000000..b25b886f
--- /dev/null
+++ b/remote/modules/xscreensaver/module.conf.ubuntu
@@ -0,0 +1,6 @@
+REQUIRED_CONTENT_PACKAGES="
+	xscreensaver
+"
+REQUIRED_INSTALLED_PACKAGES="
+	xscreensaver
+"
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
index 2903e5e4..ec98ff70 100644
--- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
+++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
@@ -5,8 +5,6 @@ echo "Configuring stage 3.2 ..."
 # first a few variables
 CONFIG="${FUTURE_ROOT}/opt/openslx/config"
 
-UUID=$(dmidecode -s system-uuid | grep -m1 -E '^[0-9A-F\-]{36}$')
-
 #########################################################################
 #
 # This function downloads the config containing environment variables
@@ -15,7 +13,7 @@ fetch_sysconfig() {
 	[ -e "$CONFIG" ] && grep -E '^#_RCONFIG_TAG$' "$CONFIG" > /dev/null \
 		&& echo "Config already fetched." && return 0
 
-	download "${SLX_BASE_PATH}/config?uuid=${UUID}" "${CONFIG}-remote" || return 1
+	download "${SLX_BASE_PATH}/config" "${CONFIG}-remote" || return 1
 
 	echo "# Config fetched from $URL" >> "$CONFIG"
 	echo "#_RCONFIG_TAG" >> "$CONFIG"
@@ -28,7 +26,7 @@ fetch_sysconfig() {
 fetch_config_files() {
 	[ -e "${CONFIG}.tgz" ] && echo "config.tgz already downloaded." && return 0
 
-	download "${SLX_BASE_PATH}/config.tgz?uuid=${UUID}" "${CONFIG}.tgz"
+	download "${SLX_BASE_PATH}/config.tgz" "${CONFIG}.tgz"
 }
 
 
diff --git a/remote/rootfs/rootfs-stage31/module.conf b/remote/rootfs/rootfs-stage31/module.conf
index e09e744b..b41b1f10 100644
--- a/remote/rootfs/rootfs-stage31/module.conf
+++ b/remote/rootfs/rootfs-stage31/module.conf
@@ -1,6 +1,5 @@
 REQUIRED_BINARIES="
 	ntpdate
-	dmidecode
 "
 REQUIRED_MODULES="
 	busybox
diff --git a/remote/rootfs/rootfs-stage31/module.conf.ubuntu b/remote/rootfs/rootfs-stage31/module.conf.ubuntu
index 6ced7b11..35c9927b 100644
--- a/remote/rootfs/rootfs-stage31/module.conf.ubuntu
+++ b/remote/rootfs/rootfs-stage31/module.conf.ubuntu
@@ -1,4 +1,3 @@
 REQUIRED_INSTALLED_PACKAGES="
 	ntpdate
-	dmidecode
 "