diff options
| author | Simon Rettberg | 2014-06-13 16:12:35 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-06-13 16:12:35 +0200 |
| commit | 99a2d831cd13781d226324c26cb632fe0d031f7f (patch) | |
| tree | 95ad73cb5e03823716d8cb4c927ef8eb271fe548 /server | |
| parent | Add gnome back to stage4 (diff) | |
| parent | v2 of quick fix for unity shell not starting. (diff) | |
| download | tm-scripts-99a2d831cd13781d226324c26cb632fe0d031f7f.tar.gz tm-scripts-99a2d831cd13781d226324c26cb632fe0d031f7f.tar.xz tm-scripts-99a2d831cd13781d226324c26cb632fe0d031f7f.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'server')
4 files changed, 7 insertions, 13 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 464dcd9f..e2618588 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,7 +16,9 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then CIFS_VOLUME=$(cat /tmp/ldapsearch.${PAM_USER} | grep rufHomepath | cut -d" " -f2 | tr '\\' '/') - if [ ! -z "${CIFS_VOLUME}" ]; then + # TODO: fix CIFS mount. Currently breaks certain file operations, e.g. firefox's sqlite files + if false; 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" export USER="${PAM_USER}" diff --git a/server/modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz b/server/modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz new file mode 100755 index 00000000..45cc71e8 --- /dev/null +++ b/server/modules/ubuntu-14.04-unity-fixes/etc/X11/Xsession.d/95-compiz @@ -0,0 +1,4 @@ +#!/bin/ash + +touch /tmp/washereagain +export COMPIZ_CONFIG_PROFILE='ubuntu' diff --git a/server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper b/server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper deleted file mode 100755 index 7500c147..00000000 --- a/server/modules/ubuntu-14.04-unity-fixes/opt/openslx/scripts/unity-wrapper +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/ash - -gnome-session --session='ubuntu' & -unity diff --git a/server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop b/server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop deleted file mode 100644 index 36ee49bc..00000000 --- a/server/modules/ubuntu-14.04-unity-fixes/usr/share/xsessions/ubuntu.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Ubuntu -Comment=This session logs you into Ubuntu -Exec=/opt/openslx/scripts/unity-wrapper -Icon= -Type=Application -X-LightDM-DesktopName=Unity -X-Ubuntu-Gettext-Domain=gnome-session-3.0 |