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

4 files changed, 27 insertions, 22 deletions

diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build
index ae1b7694..197935f7 100644
--- a/remote/modules/kernel/kernel.build
+++ b/remote/modules/kernel/kernel.build
@@ -27,9 +27,6 @@ fetch_source() {
 		pinfo "aufs detected in kernel source :)"
 	fi
 
-	# fix pc speaker
-	./patch-speaker
-
 	# remember the current kernel version
 	echo "${KERNEL_CURRENT_VERSION}" > ksrc/KVERSION
 
diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
index 535cd0d6..198d2efe 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
@@ -13,6 +13,10 @@ slxlog "session-close" "$PAM_USER logged out on $PAM_TTY"
 
 OPENSESSION=$(loginctl show-user "$PAM_USER" | grep "Sessions=" | cut -c 10-)
 SESSIONCOUNT=$(echo "$OPENSESSION" | wc -w)
+# When using su/sudo there is no session created, so count up by one
+if [ "x$PAM_SERVICE" = "xsu" -o "x$PAM_SERVICE" = "xsudo" ]; then
+	SESSIONCOUNT=$(( $SESSIONCOUNT + 1 ))
+fi
 
 if [ "$SESSIONCOUNT" = "1" ]; then
 	# last sessions, close all ghost user processes
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 43880a2c..2d6dfb41 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -485,8 +485,8 @@ else
 fi
 
 if [ -z "$vm_diskfile" ]; then
-	new_vmpath=$(ls "${vmpath}.r"* | grep -E '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1)
-	[ -n "$new_vmpath" ] && vmpath="$vmpath$new_vmpath"
+	new_vmpath=$(ls "${vmpath}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1)
+	[ -n "$new_vmpath" ] && vmpath="${vmpath}.r${new_vmpath}"
 	vm_diskfile="$vmpath"
 fi
 
diff --git a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
index f6a295f2..d8808f66 100644
--- a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
+++ b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
@@ -30,22 +30,26 @@ if [ $(id -g ${PAM_USER}) -ge 1000 ]; then
 
     # now we can mount the home directory!
 
-	MOUNT_OPTS="-t nfs4 -o rw,nosuid,nodev,nolock,intr,hard,sloppy,sec=krb5p"
-
-    SIGNAL=$(mktemp)
-    rm -f -- "${SIGNAL}"
-    (mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" || touch "${SIGNAL}") &
-    MOUNT_PID=$!
-    for COUNTER in 1 2 4 4; do
-        kill -0 "${MOUNT_PID}" 2>/dev/null || break
-        sleep "${COUNTER}"
-    done
-
-    if [ -e "${SIGNAL}" ] || kill -9 "${MOUNT_PID}" 2>/dev/null; then
-		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})"
-        rm -f -- "${SIGNAL}"
-    else
-        exit 0
-    fi
+	MOUNT_OPTS="-t nfs4 -o rw,nosuid,nodev,nolock,intr,hard,sloppy"
+	if echo "$FILESERVER" | grep -q "sunfs6"; then
+		MOUNT_OPTS="${MOUNT_OPTS},sec=krb5i"
+	else
+		MOUNT_OPTS="${MOUNT_OPTS},sec=krb5p"
+	fi
+
+	SIGNAL=$(mktemp)
+	rm -f -- "${SIGNAL}"
+	( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "/tmp/home.$PAM_USER" 2>&1 || touch "${SIGNAL}" ) &
+	MOUNT_PID=$!
+	for COUNTER in 1 2 4 4; do
+		kill -0 "${MOUNT_PID}" 2>/dev/null || break
+		sleep "${COUNTER}"
+	done
+
+	if [ -e "${SIGNAL}" ] || kill -9 "${MOUNT_PID}" 2>/dev/null; then
+		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER"
+		rm -f -- "${SIGNAL}"
+	fi
+	rm -f -- "/tmp/home.$PAM_USER"
 fi