diff options
| author | Simon Rettberg | 2014-06-16 19:09:46 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-06-16 19:09:46 +0200 |
| commit | 4acd9186d8a99f347ddc192b1ac8aceee4d6380e (patch) | |
| tree | 4f5d6ed6eb95999ea5b070079bac8e2603fb3fa5 /server | |
| parent | [rfs-stage31] Restructured init script and includes a bit... could use more work (diff) | |
| parent | dont exit, else xfwm4 will not be created (diff) | |
| download | tm-scripts-4acd9186d8a99f347ddc192b1ac8aceee4d6380e.tar.gz tm-scripts-4acd9186d8a99f347ddc192b1ac8aceee4d6380e.tar.xz tm-scripts-4acd9186d8a99f347ddc192b1ac8aceee4d6380e.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'server')
| -rw-r--r-- | server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent index e2618588..a467b301 100644 --- a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent +++ b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent @@ -16,11 +16,9 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then CIFS_VOLUME=$(cat /tmp/ldapsearch.${PAM_USER} | grep rufHomepath | cut -d" " -f2 | tr '\\' '/') - # TODO: fix CIFS mount. Currently breaks certain file operations, e.g. firefox's sqlite files - if false; then - #if [ ! -z "${CIFS_VOLUME}" ]; then + if [ ! -z "${CIFS_VOLUME}" ]; then # now we can mount the home directory! - MOUNT_OPTS="-t cifs -o uid=${USER_UID},gid=${USER_GID},forceuid,forcegid,file_mode=0600,dir_mode=0700" + MOUNT_OPTS="-t cifs -o uid=${USER_UID},gid=${USER_GID},forceuid,forcegid,file_mode=0600,dir_mode=0700,nobrl,noacl" export USER="${PAM_USER}" export PASSWD="${PAM_AUTHTOK}" |