Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

5 files changed, 97 insertions, 19 deletions

diff --git a/remote/modules/kdm/module.conf.ubuntu.14.04 b/remote/modules/kdm/module.conf.ubuntu.14
index e29f35d0..e29f35d0 100644
--- a/remote/modules/kdm/module.conf.ubuntu.14.04
+++ b/remote/modules/kdm/module.conf.ubuntu.14
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build
index 95576548..2c27231e 100644
--- a/remote/modules/systemd/module.build
+++ b/remote/modules/systemd/module.build
@@ -3,11 +3,30 @@
 fetch_source () {
 	# systemd
 	download_untar "$REQUIRED_URL" "src/"
-	# Patch PATH, HOME, USER environment
-	# TODO: Newer systemd versions support DefaultEnvironment=xxx in /etc/systemd/system.conf
-	# However, there were lots of changes after systemd 204, so we didn't update yet
-	# See http://cgit.freedesktop.org/systemd/systemd/tree/NEWS for changes.
-	patch -p0 src/systemd-*/src/core/main.c < systemd-openslx.patch || perror "Failed to apply openslx systemd patch."
+
+	# starting with systemd 212 a new way of setting global environment is supported
+	# meaning we don't have to apply the patch needed til that version.
+	if [ "x${REQUIRED_VERSION#systemd-}" = "x212" ]; then
+		pinfo "Systemd version 212 detected."
+		pinfo "REQUIRED_XATTR_PATCH is $REQUIRED_XATTR_PATCH"
+		# patch src/core/socket.c if activated in the config file
+		if [ "x$REQUIRED_XATTR_PATCH" = "xyes" ]; then
+			pinfo "Patching 'src/core/socket.c' ..."
+			# patch it
+			if [ -e "src/$REQUIRED_VERSION/src/core/socket.c" ]; then
+				sed -i 's/^#include <attr\/xattr.h>$/#include <sys\/xattr.h>\n#include <attr\/xattr.h>/g' "src/$REQUIRED_VERSION/src/core/socket.c" \
+					|| perror "Could not patch 'src/$REQUIRED_VERSION/src/core/socket.c'"
+			else
+				perror "'src/$REQUIRED_VERSION//src/core/socket.c' does not exist."
+			fi
+		fi
+	else
+		# Patch PATH, HOME, USER environment
+		# TODO: Newer systemd versions support DefaultEnvironment=xxx in /etc/systemd/system.conf
+		# However, there were lots of changes after systemd 204, so we didn't update yet
+		# See http://cgit.freedesktop.org/systemd/systemd/tree/NEWS for changes.
+		patch -p0 src/systemd-*/src/core/main.c < systemd-openslx.patch || perror "Failed to apply openslx systemd patch."
+	fi
 
 	# libkmod
 	download_untar "$REQUIRED_LIBKMOD_URL" "src/"
diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14
new file mode 100644
index 00000000..f5ed3c0f
--- /dev/null
+++ b/remote/modules/systemd/module.conf.ubuntu.14
@@ -0,0 +1,72 @@
+REQUIRED_VERSION="systemd-212"
+REQUIRED_URL="http://www.freedesktop.org/software/systemd/${REQUIRED_VERSION}.tar.xz"
+REQUIRED_LIBKMOD_VERSION="kmod-17"
+REQUIRED_LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${REQUIRED_LIBKMOD_VERSION}.tar.xz"
+
+REQUIRED_INSTALLED_PACKAGES="
+			intltool
+			gperf
+			dbus
+			pkg-config
+			libcap-dev
+			libudev-dev
+			libdbus-1-dev
+			xsltproc
+			libblkid-dev
+			libacl1-dev
+			libpam-dev
+"
+REQUIRED_BINARIES="
+	journalctl
+	loginctl
+	systemctl
+	systemd-analyze
+	systemd-ask-password
+	systemd-cat
+	systemd-cgls
+	systemd-cgtop
+	systemd-delta
+	systemd-detect-virt
+	systemd-inhibit
+	systemd-machine-id-setup
+	systemd-notify
+	systemd-nspawn
+	systemd-stdio-bridge
+	systemd-tmpfiles
+	systemd-tty-ask-password-agent
+	udevadm
+	systemd
+	systemd-ac-power
+	systemd-binfmt
+	systemd-cgroups-agent
+	systemd-fsck
+	systemd-initctl
+	systemd-journald
+	systemd-logind
+	systemd-modules-load
+	systemd-multi-seat-x
+	systemd-random-seed
+	systemd-readahead
+	systemd-remount-fs
+	systemd-reply-password
+	systemd-shutdown
+	systemd-shutdownd
+	systemd-sleep
+	systemd-sysctl
+	systemd-udevd
+	systemd-update-utmp
+	systemd-user-sessions
+	systemd-vconsole-setup
+	systemd-fstab-generator
+	systemd-getty-generator
+	systemd-rc-local-generator
+	systemd-system-update-generator
+	accelerometer
+	ata_id
+	cdrom_id
+	collect
+	mtd_probe
+	scsi_id
+	v4l_id
+"
+REQUIRED_XATTR_PATCH="yes"
diff --git a/remote/modules/systemd/module.conf.ubuntu.14.04 b/remote/modules/systemd/module.conf.ubuntu.14.04
deleted file mode 100644
index 2768b51c..00000000
--- a/remote/modules/systemd/module.conf.ubuntu.14.04
+++ /dev/null
@@ -1,13 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-			intltool
-			gperf
-			dbus
-			pkg-config
-			libcap-dev
-			libudev-dev
-			libdbus-1-dev
-			xsltproc
-			libblkid-dev
-			libacl1-dev
-			libpam-dev
-"
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index ec9f906e..c4ae4617 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -51,7 +51,7 @@ cleanexit () {
 	sleep 1
 	# remove config dirs when exit
 	if echo "${RMDIRS}" 2>/dev/null | grep -q "${xmlvirt}"; then
-		writelog "${xmlvirt} exited. Cleanning up... \c"
+		writelog "${xmlvirt} exited. Cleaning up... \c"
 		rm -rf -- ${RMDIRS} >/dev/null 2>&1
 		writelog "done"
 	fi