diff options
| author | Manuel Schneider | 2013-12-02 19:19:26 +0100 |
|---|---|---|
| committer | Manuel Schneider | 2013-12-02 19:19:26 +0100 |
| commit | f8a146d746b7d61fc8e1bf2eb97e448ca47a857a (patch) | |
| tree | 0b736e1698069de2dc442931de529f1ccd40f9a8 /remote/modules/pam/data | |
| parent | xmodesetter (diff) | |
| parent | [xorg] Support /etc/X11/Xsession.d (diff) | |
| download | tm-scripts-f8a146d746b7d61fc8e1bf2eb97e448ca47a857a.tar.gz tm-scripts-f8a146d746b7d61fc8e1bf2eb97e448ca47a857a.tar.xz tm-scripts-f8a146d746b7d61fc8e1bf2eb97e448ca47a857a.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/pam/data')
| -rwxr-xr-x | remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close | 4 | ||||
| -rwxr-xr-x | remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 12 |
2 files changed, 10 insertions, 6 deletions
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 7c533405..d3b5ebb3 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 @@ -26,10 +26,10 @@ if [ "x${OPENSESSIONS}" == "x1" ]; then pkill -9 -u "${PAM_USER}" # unmount the home directory structure - umount "/home/${PAM_USER}/PERSISTENT" || \ + umount -l "/home/${PAM_USER}/PERSISTENT" || \ echo "Could not unmount '/home/${PAM_USER}/PERSISTENT'." - umount "/home/${PAM_USER}" || \ + umount -l "/home/${PAM_USER}" || \ echo "Could not unmount '/home/${PAM_USER}'." fi diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open index 63fb3413..8533f421 100755 --- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open +++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open @@ -19,8 +19,6 @@ mount | grep -q "$TEMP_HOME_DIR" && exit 0 # no home, lets create it mkdir -p "${TEMP_HOME_DIR}" || \ { slxlog "pam-global-mktemphome" "Could not create '${TEMP_HOME_DIR}'."; exit 1; } -chown -R "${PAM_USER}" "${TEMP_HOME_DIR}" || \ - { slxlog "pam-global-chtemphome" "Could not chown '${TEMP_HOME_DIR}' to ${PAM_USER}."; exit 1; } # now make it a tmpfs mount -t tmpfs -o size=100m tmpfs "${TEMP_HOME_DIR}" || \ @@ -43,9 +41,15 @@ cat > "${PERSISTENT_HOME_DIR}/WARNING.txt" << EOF Your home directory contents is unavailable. DO NOT SAVE ANYTHING HERE AS ALL WILL BE LOST UPON REBOOT! EOF +# Try to get the user's attention (probably unsuccessful anyways) +for ext in doc xls ppt odt; do + for fname in WARNING ACHTUNG ATTENTION; do + ln "${PERSISTENT_HOME_DIR}/WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}" + done +done -chown -R "${PAM_USER}" "${PERSISTENT_HOME_DIR}" || \ - { slxlog "pam-global-chpersistent " "Could not chown '${PERSISTENT_HOME_DIR}' to '${PAM_USER}'."; exit 1; } +chown -R "${PAM_USER}" "${TEMP_HOME_DIR}" || \ + { slxlog "pam-global-chpersistent " "Could not chown '${TEMP_HOME_DIR}' to '${PAM_USER}'."; exit 1; } # now lets see if we have a persistent directory [ ! -e "${PERSISTENT_MOUNT_SCRIPT}" ] && exit 0 |