From 375a05f32f65fdc1671b6eb4b553c4526c0ada53 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 2 Dec 2013 16:59:42 +0100 Subject: [pam] lazy umount home directories --- remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'remote/modules/pam') 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 -- cgit v1.2.3-55-g7522 From cb9d97cf8ddaf86d140d38f314180222f2616846 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 2 Dec 2013 17:05:59 +0100 Subject: [pam] More warnings for user if homedir is not available --- remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'remote/modules/pam') 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..af9d059e 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 @@ -43,6 +43,12 @@ 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 docx xls xlsx ppt pptx odt rtf wri ini inf; do + for fname in WARNING WARNUNG ACHTUNG VORSICHT STOPP ATTENTION CAREFUL OBACHT; do + ln -s "${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; } -- cgit v1.2.3-55-g7522 From ff7c7b834e750d4e0bed1aa87e39b20070acada5 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 2 Dec 2013 17:08:18 +0100 Subject: [pam] unneeded chmod --- remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'remote/modules/pam') 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..7c752641 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}" || \ @@ -44,7 +42,7 @@ Your home directory contents is unavailable. DO NOT SAVE ANYTHING HERE AS ALL WILL BE LOST UPON REBOOT! EOF -chown -R "${PAM_USER}" "${PERSISTENT_HOME_DIR}" || \ +chown -R "${PAM_USER}" "${TEMP_HOME_DIR}" || \ { slxlog "pam-global-chpersistent " "Could not chown '${PERSISTENT_HOME_DIR}' to '${PAM_USER}'."; exit 1; } # now lets see if we have a persistent directory -- cgit v1.2.3-55-g7522 From 711525844cbdf4f3fea000932b4d2acbf9ea0933 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 2 Dec 2013 17:13:27 +0100 Subject: [pam] fix slxlog msg --- remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote/modules/pam') 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 881d5be0..0774775b 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 @@ -49,7 +49,7 @@ for ext in doc docx xls xlsx ppt pptx odt rtf wri ini inf; do done chown -R "${PAM_USER}" "${TEMP_HOME_DIR}" || \ - { slxlog "pam-global-chpersistent " "Could not chown '${PERSISTENT_HOME_DIR}' to '${PAM_USER}'."; exit 1; } + { 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 -- cgit v1.2.3-55-g7522 From ec2b773aaa825e55c7aaff290aa819b0084a977a Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 2 Dec 2013 17:37:35 +0100 Subject: [pam] Fix link, make it relative --- remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote/modules/pam') 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 0774775b..c0195eeb 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 @@ -44,7 +44,7 @@ EOF # Try to get the user's attention (probably unsuccessful anyways) for ext in doc docx xls xlsx ppt pptx odt rtf wri ini inf; do for fname in WARNING WARNUNG ACHTUNG VORSICHT STOPP ATTENTION CAREFUL OBACHT; do - ln -s "${PERSISTENT_HOME_DIR}/WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}" + ln -s "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}" done done -- cgit v1.2.3-55-g7522 From bc31ea71fe77bc9e0e448df0caa6d1d92807a912 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 2 Dec 2013 18:03:30 +0100 Subject: [pam] Warnings need to be hard links as vmware/windows chokes on symlinks --- remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'remote/modules/pam') 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 c0195eeb..6b46ca0d 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 @@ -42,9 +42,9 @@ 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 docx xls xlsx ppt pptx odt rtf wri ini inf; do - for fname in WARNING WARNUNG ACHTUNG VORSICHT STOPP ATTENTION CAREFUL OBACHT; do - ln -s "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}" +for ext in doc xls ppt odt; do + for fname in WARNING ACHTUNG ATTENTION; do + ln "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}" done done -- cgit v1.2.3-55-g7522 From 35d95372798a1ba59b5e303b668750411e1bfec6 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 2 Dec 2013 18:27:03 +0100 Subject: - --- remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote/modules/pam') 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 6b46ca0d..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 @@ -44,7 +44,7 @@ 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 "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}" + ln "${PERSISTENT_HOME_DIR}/WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}" done done -- cgit v1.2.3-55-g7522