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

17 files changed, 181 insertions, 28 deletions

diff --git a/remote/modules/dbus/module.conf.centos b/remote/modules/dbus/module.conf.centos
new file mode 100644
index 00000000..f38f590f
--- /dev/null
+++ b/remote/modules/dbus/module.conf.centos
@@ -0,0 +1,4 @@
+REQUIRED_CONTENT_PACKAGES="
+			dbus
+"
+
diff --git a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
index 964c49c4..f034553c 100755
--- a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
+++ b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
@@ -127,5 +127,9 @@ if [ -n "$SLX_SHUTDOWN_SCHEDULE" -o -n "$SLX_REBOOT_SCHEDULE" ] && [ ! -e "$CRON
 		[ "$MINUTE" -lt 0 -o "$MINUTE" -gt 59 ] && invalid_time && continue
 		echo "$MINUTE $HOUR	* * *	root	/opt/openslx/scripts/idleaction-scheduled_reboot" >> "$CRONFILE"
 	done
+	(
+		sleep 20
+		systemctl restart cron
+	) &
 fi
 
diff --git a/remote/modules/idleaction/module.conf.centos b/remote/modules/idleaction/module.conf.centos
new file mode 100644
index 00000000..d368cbd8
--- /dev/null
+++ b/remote/modules/idleaction/module.conf.centos
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	libX11-devel
+	libXScrnSaver-devel
+	xorg-x11-proto-devel
+"
+
diff --git a/remote/modules/kernel/module.conf.centos b/remote/modules/kernel/module.conf.centos
new file mode 100644
index 00000000..2e958ce4
--- /dev/null
+++ b/remote/modules/kernel/module.conf.centos
@@ -0,0 +1,3 @@
+REQUIRED_GIT_BRANCH="v${SYSTEM_KERNEL_SHORT%.0}"
+REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
+
diff --git a/remote/modules/nscd/module.conf.centos b/remote/modules/nscd/module.conf.centos
new file mode 100644
index 00000000..4a61cc19
--- /dev/null
+++ b/remote/modules/nscd/module.conf.centos
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	nscd
+"
+REQUIRED_CONTENT_PACKAGES="
+	nscd
+"
diff --git a/remote/modules/pam/module.build b/remote/modules/pam/module.build
index 3f0d8861..b678fdd6 100644
--- a/remote/modules/pam/module.build
+++ b/remote/modules/pam/module.build
@@ -28,12 +28,13 @@ build() {
 	tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}"
 
 	# build pam-script separatly since we use a source tarball
+
 	# HACK: find pam_unix.so in MODULE_BUILD_DIR to see where to put pam_script at
-	cd "$MODULE_BUILD_DIR"
-	local PAM_UNIX_LOCATION=$(find . -name pam_unix.so)
 	cd "${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}" || perror "Could not cd to ${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}."
-	./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$(dirname ${PAM_UNIX_LOCATION:1})" || perror "pam-script: ./configure failed."
+	./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$SYS_PAM_MODULES_PATH" || perror "pam-script: ./configure failed."
 	make DESTDIR="${MODULE_BUILD_DIR}" install || perror "pam-script: make install to ${MODULE_BUILD_DIR} failed."
+
+
 	# openSuse 13.1 has no package nss-pam-ldapd. So, we compile it.
 	if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then
 		cd "${MODULE_DIR}/src/$REQUIRED_NSS_LDAPD_VERSION"
@@ -46,7 +47,7 @@ build() {
 		cd "$MODULE_BUILD_DIR"
 		local NSLCD_PATH=$(which nslcd)
 	fi
-	[ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'"
+	[[ $REQUIRED_BINARIES = *nslcd* ]] && [ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'"
 	# Build nslcd service file
 	mkdir -p "etc/systemd/system"
 	sed "s,%PATH%,$NSLCD_PATH,g" "$MODULE_DIR/templates/nslcd-systemd.service" > "etc/systemd/system/nslcd.service" || perror "Could not fill nslcd.service template"
diff --git a/remote/modules/pam/module.conf.centos b/remote/modules/pam/module.conf.centos
new file mode 100644
index 00000000..5dadea53
--- /dev/null
+++ b/remote/modules/pam/module.conf.centos
@@ -0,0 +1,36 @@
+# erase generic conf settings
+REQUIRED_BINARIES=""
+REQUIRED_FILES=""
+REQUIRED_INSTALLED_PACKAGES="
+	pam
+	pam-devel
+	pam_krb5
+	libnfsidmap
+	nss-mdns
+	openssl-devel
+	nfs-utils
+	glibc
+"
+REQUIRED_CONTENT_PACKAGES="
+	pam
+	pam-devel
+	pam_krb5
+	libnfsidmap
+	nss-mdns
+	nfs-utils
+	glibc
+"
+REQUIRED_LIBRARIES+="
+	libnss_compat
+	libnss_db
+	libnss_dns
+	libnss_files
+	libnss_nis
+"
+REQUIRED_DIRECTORIES+="
+	/$LIB64
+"
+REQUIRED_SYSTEM_FILES+="
+	$SYS_PAM_MODULES_PATH
+"
+
diff --git a/remote/modules/pam/module.conf.ubuntu b/remote/modules/pam/module.conf.ubuntu
index 31023197..4a3635fc 100644
--- a/remote/modules/pam/module.conf.ubuntu
+++ b/remote/modules/pam/module.conf.ubuntu
@@ -39,13 +39,11 @@ REQUIRED_BINARIES+="
 	mount.cifs
 "
 REQUIRED_DIRECTORIES+="
+	$SYS_PAM_MODULES_PATH
 	/lib
 	/usr/lib
 "
 REQUIRED_SYSTEM_FILES+="
 	/etc/pam.conf
 	/etc/default/locale
-	/lib/security
-	/lib/${ARCH_TRIPLET}/security
-	/sbin/mkhomedir_helper
 "
diff --git a/remote/modules/pam/module.conf.ubuntu.14 b/remote/modules/pam/module.conf.ubuntu.14
index 2f46770c..26307d84 100644
--- a/remote/modules/pam/module.conf.ubuntu.14
+++ b/remote/modules/pam/module.conf.ubuntu.14
@@ -39,20 +39,19 @@ REQUIRED_BINARIES+="
 	mount.cifs
 "
 REQUIRED_DIRECTORIES+="
+	$SYS_PAM_MODULES_PATH
 	/lib
 	/usr/lib
 "
 REQUIRED_SYSTEM_FILES+="
 	/etc/pam.conf
 	/etc/default/locale
-	/lib/${ARCH_TRIPLET}/security
-	/sbin/mkhomedir_helper
 "
 
 # For Ubuntu 14.04: Both packages were dropped from official repos. Do not change the
 # order, as these packages will be installed via dpkg and depend on each other.
 REQUIRED_DOWNLOAD_URLS="
-	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb	
+	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb
 	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libpam-ncp_2.2.6-9ubuntu1_amd64.deb
 	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/ncpfs_2.2.6-9ubuntu1_amd64.deb
 "
diff --git a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
index 75ba0709..b33889df 100644
--- a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
+++ b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
@@ -1,11 +1,9 @@
 #!/bin/ash
 
 # If the ENV var PVS has been set by vmchooser start pvsclient
-if [ -n "$PVS" -a  "$PVS" = "true" ]; then
-	if [ -n "$PVS_SESSIONID" ]; then
-		pvsclient --session-id "$PVS_SESSIONID" &
-	else
-		pvsclient &
-	fi
+if [ -n "$PVS_SESSIONID" ]; then
+	pvsclient --session-id "$PVS_SESSIONID" &
+else
+	pvsclient &
 fi
 
diff --git a/remote/modules/rsyslogd/module.conf.centos b/remote/modules/rsyslogd/module.conf.centos
new file mode 100644
index 00000000..6f3cb891
--- /dev/null
+++ b/remote/modules/rsyslogd/module.conf.centos
@@ -0,0 +1,3 @@
+REQUIRED_CONTENT_PACKAGES="	
+			rsyslog
+"
diff --git a/remote/modules/smartctl/module.conf.centos b/remote/modules/smartctl/module.conf.centos
new file mode 100644
index 00000000..d699f2f0
--- /dev/null
+++ b/remote/modules/smartctl/module.conf.centos
@@ -0,0 +1,6 @@
+REQUIRED_CONTENT_PACKAGES="
+	smartmontools
+"
+REQUIRED_INSTALLED_PACKAGES="
+	smartmontools
+"
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build
index 4851f682..6e1cf4c1 100644
--- a/remote/modules/systemd/module.build
+++ b/remote/modules/systemd/module.build
@@ -59,11 +59,28 @@ build () {
 	export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib64/pkgconfig:${MODULE_BUILD_DIR}/usr/lib/pkgconfig"
 	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib:${MODULE_BUILD_DIR}/usr/lib64"
 
-	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \
-			--disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \
-			--disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \
-			--enable-kmod \
+	./configure \
+		--disable-manpages \
+		--enable-split-usr \
+		--sysconfdir="/etc" \
+		--enable-gtk-doc-html=no \
+		--disable-nls \
+		--disable-microhttpd \
+		--disable-bootchart \
+		--disable-quotacheck \
+		--disable-hostnamed \
+		--disable-timedated \
+		--disable-localed \
+		--disable-coredump \
+		--disable-keymap \
+		--without-python \
+		--enable-blkid \
+		--enable-acl \
+		--enable-pam \
+		--enable-kmod \
+		--with-pamlibdir="$SYS_PAM_MODULES_PATH" \
 			|| perror "configure failed."
+
 	pinfo "calling make"
 	make || perror "make failed."
 	pinfo "calling make install"
@@ -82,12 +99,5 @@ post_copy() {
 	if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ]; then
 		sed -i "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
 	fi
-
-	# add pam_systemd.so to pam modules directory
-	if [ -e "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" ]; then
-		cp "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" "${TARGET_BUILD_DIR}/lib/security/"
-	else
-		pdebug "No such file: ${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so"
-	fi
 }
 
diff --git a/remote/modules/systemd/module.conf b/remote/modules/systemd/module.conf
index 4ca11365..1bc0165e 100644
--- a/remote/modules/systemd/module.conf
+++ b/remote/modules/systemd/module.conf
@@ -56,6 +56,7 @@ REQUIRED_BINARIES="
 	scsi_id
 	v4l_id"
 REQUIRED_DIRECTORIES="
+	$SYS_PAM_MODULES_PATH
 	/etc
 	/usr/include
 	/usr/share/dbus-1
diff --git a/remote/modules/systemd/module.conf.centos b/remote/modules/systemd/module.conf.centos
new file mode 100644
index 00000000..9232ea5f
--- /dev/null
+++ b/remote/modules/systemd/module.conf.centos
@@ -0,0 +1,11 @@
+REQUIRED_INSTALLED_PACKAGES="
+			intltool
+			gperf
+			libcap-devel
+			libudev-devel
+			dbus-devel
+			libxslt
+			libblkid-devel
+			libacl-devel
+			glib2-devel
+"
diff --git a/remote/modules/vmchooser2/module.build b/remote/modules/vmchooser2/module.build
index e129b04e..b2f89702 100644
--- a/remote/modules/vmchooser2/module.build
+++ b/remote/modules/vmchooser2/module.build
@@ -1,6 +1,6 @@
 
 fetch_source() {
-	git clone --depth 1 "${REQUIRED_GIT}" src
+	git clone "${REQUIRED_GIT}" src
 }
 
 build() {
diff --git a/remote/modules/xorg/module.conf.centos b/remote/modules/xorg/module.conf.centos
new file mode 100644
index 00000000..ff5846e3
--- /dev/null
+++ b/remote/modules/xorg/module.conf.centos
@@ -0,0 +1,67 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
+REQUIRED_INSTALLED_PACKAGES="
+			xorg-x11-server-Xorg
+			xorg-x11-drv-vmware
+			xorg-x11-drv-ati
+			xorg-x11-drv-nouveau
+			xorg-x11-drv-intel
+			xorg-x11-drv-vesa
+			xorg-x11-drv-fbdev
+			xorg-x11-drv-modesetting
+			xorg-x11-drv-vmmouse
+			xorg-x11-drv-wacom
+			xorg-x11-drv-evdev
+			xorg-x11-drv-keyboard
+			xorg-x11-drv-mouse
+			xorg-x11-drv-synaptics
+			xorg-x11-drv-void
+			xkeyboard-config
+			dejavu-sans-fonts
+			libxcb
+			mesa-dri-drivers
+			mesa-libGL
+			xorg-x11-xkb-utils
+			xorg-x11-xkb-extras
+			pixman
+			xorg-x11-server-utils
+"
+REQUIRED_CONTENT_PACKAGES="
+			xorg-x11-server-Xorg
+			xorg-x11-drv-vmware
+			xorg-x11-drv-ati
+			xorg-x11-drv-nouveau
+			xorg-x11-drv-intel
+			xorg-x11-drv-vesa
+			xorg-x11-drv-fbdev
+			xorg-x11-drv-modesetting
+			xorg-x11-drv-vmmouse
+			xorg-x11-drv-wacom
+			xorg-x11-drv-evdev
+			xorg-x11-drv-keyboard
+			xorg-x11-drv-mouse
+			xorg-x11-drv-synaptics
+			xorg-x11-drv-void
+			xkeyboard-config
+			dejavu-sans-fonts
+			libxcb
+			mesa-dri-drivers
+			mesa-libGL
+			xorg-x11-xkb-utils
+			xorg-x11-xkb-extras
+			pixman
+			xorg-x11-server-utils
+"
+REQUIRED_LIBRARIES="
+			libxcb-glx
+			libIntelXvMC
+			i965_dri
+			vmwgfx_dri
+			i915_dri
+			libpixman-1
+"
+REQUIRED_DIRECTORIES+="
+			/usr/bin
+			/usr/lib/udev
+			/usr/$LIB64/xorg
+			/usr/share/fonts
+"