From 39521a9a09b896aa2fa7452d9f5af25641a2de6e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 12 Dec 2013 16:44:06 +0100
Subject: [kernel] Fix bug that makes the pc speaker play weird melodies

---
 remote/modules/kernel/kernel.build | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'remote/modules')

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
 
-- 
cgit v1.2.3-55-g7522


From 20ce232c145199d32e9ee3b38367023caa2cf0bd Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 12 Dec 2013 19:08:04 +0100
Subject: [pam] Fix session cleanup after last logout: su/sudo would not create
 a new session with logind, so an active user session could have been killed

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'remote/modules')

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
-- 
cgit v1.2.3-55-g7522


From 0012b64ec1a080051ed41f5b4f19bc68c0f0af12 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 12 Dec 2013 20:39:53 +0100
Subject: [vmchooser] Fix NFS fallback once again

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'remote/modules')

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
 
-- 
cgit v1.2.3-55-g7522