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

3 files changed, 30 insertions, 29 deletions

diff --git a/remote/modules/systemd/data/usr/lib/systemd/system/debug-shell.service b/remote/modules/systemd/data/usr/lib/systemd/system/debug-shell.service
index 1942c987..4220d7c2 100644
--- a/remote/modules/systemd/data/usr/lib/systemd/system/debug-shell.service
+++ b/remote/modules/systemd/data/usr/lib/systemd/system/debug-shell.service
@@ -13,7 +13,7 @@ IgnoreOnIsolate=yes
 
 [Service]
 Environment=TERM=linux
-ExecStart=/sbin/sushell
+ExecStart=/bin/ash
 Restart=always
 RestartSec=0
 StandardInput=tty
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build
index 2c27231e..4851f682 100644
--- a/remote/modules/systemd/module.build
+++ b/remote/modules/systemd/module.build
@@ -6,26 +6,28 @@ fetch_source () {
 
 	# 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
+	# 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
-	else
+	fi
+	# now check if the old fix needs to be applied
+	# NOTE: only for systemd-204
+	if [ "x${REQUIRED_VERSION#systemd-}" = "x204" ]; then
 		# 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."
+	else
+		# TODO use the above hint for setting environmenet through /etc/systemd/system.conf
+		pinfo "Missing..."
 	fi
 
 	# libkmod
diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14
index f5ed3c0f..7b2f853c 100644
--- a/remote/modules/systemd/module.conf.ubuntu.14
+++ b/remote/modules/systemd/module.conf.ubuntu.14
@@ -1,20 +1,19 @@
-REQUIRED_VERSION="systemd-212"
+REQUIRED_VERSION="systemd-204"
 REQUIRED_URL="http://www.freedesktop.org/software/systemd/${REQUIRED_VERSION}.tar.xz"
-REQUIRED_LIBKMOD_VERSION="kmod-17"
+REQUIRED_LIBKMOD_VERSION="kmod-14"
 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
+	intltool
+	gperf
+	dbus
+	pkg-config
+	libcap-dev
+	libudev-dev
+	libdbus-1-dev
+	xsltproc
+	libblkid-dev
+	libacl1-dev
+	libpam-dev
 "
 REQUIRED_BINARIES="
 	journalctl