diff options
| author | Simon Rettberg | 2013-11-16 12:10:12 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-16 12:10:12 +0100 |
| commit | 6e2b26c2b1bba2810c6cefff659e66d5613d563c (patch) | |
| tree | 4ff796678336b188681c582649462195a6d88d16 | |
| parent | [pam-offenburg] Cleanup, style, fix session close script (diff) | |
| parent | [vmchooser] quick fix for tcpsrvd not exiting properly. (diff) | |
| download | tm-scripts-6e2b26c2b1bba2810c6cefff659e66d5613d563c.tar.gz tm-scripts-6e2b26c2b1bba2810c6cefff659e66d5613d563c.tar.xz tm-scripts-6e2b26c2b1bba2810c6cefff659e66d5613d563c.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 16 | ||||
| -rwxr-xr-x | server/modules/pam-freiburg/opt/openslx/scripts/pam_script_ses_open | 15 |
2 files changed, 17 insertions, 14 deletions
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 dac60520..01456c0f 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -519,20 +519,20 @@ if [ -e /opt/openslx/etc/"${xmlvirt}"/run-virt.include ] ; then sleep "$timeout" done fi - + # Postrun for commands after virtualization finishes + if [ -n "${POSTRUN}" ]; then + eval ${POSTRUN} >/dev/null 2>&1 + fi + + # Kill LPD + kill $PID_LPD + cleanexit 0 else writelog "Failed because of missing ${xmlvirt} plugin." cleanexit 1 fi -# Postrun for commands after virtualization finishes -if [ -n "${POSTRUN}" ]; then - eval ${POSTRUN} >/dev/null 2>&1 -fi - -# Kill LPD -kill $PID_LPD cleanexit 0 diff --git a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_ses_open b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_ses_open index abb353d8..c06f1bbb 100755 --- a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_ses_open +++ b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_ses_open @@ -27,12 +27,15 @@ if [ $(id -g $PAM_USER) -ge 1000 ]; then # now we can mount the home directory! mkdir -p /home/$PAM_USER - if mount -t nfs4 -o rw,nosuid,nodev,nolock,intr,hard,sloppy,sec=krb5p "$FILESERVER":"$VOLUME" /home/"$PAM_USER"; then - exit 0 - else - echo "Failed to mount home directory for $PAM_USER" - exit 1 + chown "$PAM_USER" "/home/$PAM_USER" + mount -t nfs4 -o rw,nosuid,nodev,nolock,intr,hard,sloppy,sec=krb5p "$FILESERVER":"$VOLUME" /home/"$PAM_USER" & + MOUNT_PID=$! + for COUNTER in 1 2 4 4; do + kill -0 "$MOUNT_PID" || break + sleep "$COUNTER" + done + if kill -9 "$MOUNT_PID"; then + echo "Your home directory contents is unavailable. DO NOT SAVE ANYTHING HERE AS ALL WILL BE LOST UPON REBOOT!" > /home/"$PAM_USER"/WARNING.txt fi - fi |