diff options
| author | Manuel Schneider | 2013-12-13 10:19:45 +0100 |
|---|---|---|
| committer | Manuel Schneider | 2013-12-13 10:19:45 +0100 |
| commit | d3eeda7d767e38c6a99bd6b9defa1cec6e7a733a (patch) | |
| tree | 7ca9f0d6628ac118e85c2e1f652c2fd1df0dcba5 /remote | |
| parent | [cups] duplex on RZFARBE as standard (diff) | |
| parent | [vmchooser] Fix NFS fallback once again (diff) | |
| download | tm-scripts-d3eeda7d767e38c6a99bd6b9defa1cec6e7a733a.tar.gz tm-scripts-d3eeda7d767e38c6a99bd6b9defa1cec6e7a733a.tar.xz tm-scripts-d3eeda7d767e38c6a99bd6b9defa1cec6e7a733a.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
3 files changed, 6 insertions, 5 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 |