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

6 files changed, 31 insertions, 16 deletions

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 76f9ce6d..027024cf 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -47,5 +47,12 @@ post_copy() {
 
 	# add nfs to modules-load list
 	echo "nfs" > "${TARGET_BUILD_DIR}/etc/modules-load.d/nfs.conf"
+
+	# 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/systemd.conf b/remote/modules/systemd/systemd.conf
index 7623b58e..1bf44782 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -107,4 +107,3 @@ REQUIRED_DIRECTORIES="
 	/usr/lib/systemd
 	/usr/lib/tmpfiles.d
 "
-REQUIRED_FILES="	/usr/lib/security/pam_systemd.so"
diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper
index 33aba5eb..9f7d69e7 100644
--- a/remote/modules/xorg/xorg.conf.zypper
+++ b/remote/modules/xorg/xorg.conf.zypper
@@ -1,4 +1,5 @@
-REQUIRED_CONTENT_PACKAGES="	xorg-x11
+REQUIRED_CONTENT_PACKAGES="
+			xorg-x11
 			xorg-x11-server
 			xorg-x11-driver-input
 			xorg-x11-driver-video
@@ -24,7 +25,18 @@ REQUIRED_CONTENT_PACKAGES="	xorg-x11
 			xkbcomp
 			dejavu-fonts
 			libxcb-glx0
-			kdm-branding-openSUSE"
+			kdm-branding-openSUSE
+			Mesa
+"
+REQUIRED_LIBRARIES="
+	libI810XvMC
+	libxcb-glx
+	libIntelXvMC
+	i965_dri
+	vmwgfx_dri
+	i915_dri
+	i965_drv_video
+"
 REQUIRED_BINARIES="	Xorg
 			gtf
 			cvt 
@@ -36,8 +48,11 @@ REQUIRED_BINARIES="	Xorg
 			xkbbell 
 			xkbevd 
 			vmmouse_detect"
-REQUIRED_DIRECTORIES="	/usr/lib 
-			/usr/bin
-			/usr/share/X11
-			/usr/share/fonts"
+REQUIRED_DIRECTORIES="
+	/usr/lib/udev
+	/usr/lib/xorg
+	/usr/bin
+	/usr/share/X11
+	/usr/share/fonts
+"
 REQUIRED_FILES="/var/adm/fillup-templates/sysconfig.displaymanager-kdm"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index a796f738..4e16996b 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -97,6 +97,7 @@ post_copy() {
 	mkdir -p "${TARGET_BUILD_DIR}/root"
 	mkdir -p "${TARGET_BUILD_DIR}/home/demo"
 	chown "$DEMO_ID:$DEMO_ID" "${TARGET_BUILD_DIR}/home/demo"
+	sed -i -r 's/^blacklist.*pcspkr/#&/g' "$TARGET_BUILD_DIR/etc/modprobe.d/blacklist.conf"
 
 	echo "minilinux-$(hostname)" > "${TARGET_BUILD_DIR}/etc/hostname"
 	# check for kernel modules, if not present copy from system
diff --git a/remote/setup_target b/remote/setup_target
index 286daf3a..46c1d978 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -7,18 +7,10 @@ MODULES_DIR="${MODE_DIR}/modules"
 PROCESSED_MODULES=""
 
 initial_checks () {
-
-	# check for required tools
-	for BIN in git locate depmod
-	do
-		local TEST=$(which ${BIN})
-		[ -z "$TEST" ] && pinfo "Installing $BIN..." && apt-get install $BIN
-	done
-
+	:
 }
 
 read_config () {
-
 	# unset previous variables from other config files
 	for VARNAME in ${!REQUIRED_*}; do
 		unset $VARNAME
diff --git a/remote/targets/stage32/german b/remote/targets/stage32/german
new file mode 120000
index 00000000..4469f96e
--- /dev/null
+++ b/remote/targets/stage32/german
@@ -0,0 +1 @@
+../../modules/german
\ No newline at end of file