Changeset 540

Timestamp:

10/09/09 20:13:17 (2 years ago)

Author:

tschmitt

Message:

• Mountoptionen in pam_mount.conf.xml-Vorlage für Hardy und Intrepid angepasst: iocharset=utf8 ergänzt, rsize und wsize entfernt.
• Weitere auszuschließende Dateien in /etc/linuxmuster-client/profile.exclude ergänzt.
• Kleine Aufräumaktion in helperfunctions.sh.
• "exit 0" am Ende von /etc/gdm/PostLogin/Default ergänzt (ohne das bricht Hardy's gdm den Login-Vorgang ab).
• Obsolete Konfigurationsdatei hardy/templates/etc/security/pam_mount.conf entfernt.

Location:

client/linuxmuster-client/trunk

Files:

• debian/changelog (modified) (1 diff)
• etc/Default (modified) (1 diff)
• etc/profile.exclude (modified) (1 diff)
• hardy/templates/etc/security/pam_mount.conf (deleted)
• hardy/templates/etc/security/pam_mount.conf.xml (modified) (1 diff)
• share/helperfunctions.sh (modified) (2 diffs)
• share/mount.sh (modified) (1 diff)
• share/umount.sh (modified) (1 diff)

client/linuxmuster-client/trunk/debian/changelog

@@ +1 @@
+linuxmuster-client (0.9.14-1) testing; urgency=low
+
+  * added iocharset=utf8 to and removed wsize,rsize mount options from pam_mount.conf.xml template for hardy and intrepid also.
+  * added more excludes to profile.exclude.
+  * minor code cleanup in helperfunctions.sh.
+  * added "exit 0" at the end of /etc/gdm/PostLogin/Default (an error causes Hardy's gdm to cancle the user session.
+  * removed obsolete config file hardy/templates/etc/security/pam_mount.conf.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Fri, 9 Oct 2009 19:48:13 +0200
+
 linuxmuster-client (0.9.13-1) testing; urgency=low
 

client/linuxmuster-client/trunk/etc/Default

@@ -65 +65 @@
 fi
 
+exit 0
+

client/linuxmuster-client/trunk/etc/profile.exclude

@@ -3 +3 @@
 keyrings/
 metacity/sessions/
+share/tracker/
+share/Trash/
+tracker/
 

client/linuxmuster-client/trunk/hardy/templates/etc/security/pam_mount.conf.xml

@@ -14 +14 @@
 <umount>/usr/share/linuxmuster-client/umount.sh %(USER) %(MNTPT)</umount>
 
-
-
 <mntcheck>/bin/mount</mntcheck>
 
 <pmvarrun>/usr/sbin/pmvarrun -u %(USER) -d -o %(OPERATION)</pmvarrun>
 
-<volume options="rw,nosuid,nodev,wsize=8192,rsize=8192,nobrl" user="*" mountpoint="~" path="%(USER)" server="@@serverip@@" fstype="cifs" />
+<volume options="rw,nosuid,nodev,iocharset=utf8,nobrl" user="*" mountpoint="~" path="%(USER)" server="@@serverip@@" fstype="cifs" />
 
-<volume options="rw,nosuid,nodev,wsize=8192,rsize=8192" user="*" mountpoint="@@studentshome@@" path="students" server="@@serverip@@" fstype="cifs" />
+<volume options="rw,nosuid,nodev,iocharset=utf8" user="*" mountpoint="@@studentshome@@" path="students" server="@@serverip@@" fstype="cifs" />
 
-<volume options="rw,nosuid,nodev,wsize=8192,rsize=8192" user="*" mountpoint="@@sharehome@@" path="shares" server="@@serverip@@" fstype="cifs" />
+<volume options="rw,nosuid,nodev,iocharset=utf8" user="*" mountpoint="@@sharehome@@" path="shares" server="@@serverip@@" fstype="cifs" />
 
-<volume options="rw,nosuid,nodev,wsize=8192,rsize=8192" user="*" mountpoint="@@progsdir@@" path="pgm" server="@@serverip@@" fstype="cifs" />
+<volume options="rw,nosuid,nodev,iocharset=utf8" user="*" mountpoint="@@progsdir@@" path="pgm" server="@@serverip@@" fstype="cifs" />
 
-<volume options="rw,nosuid,nodev,wsize=8192,rsize=8192" user="*" mountpoint="@@cdsdir@@" path="cdrom" server="@@serverip@@" fstype="cifs" />
+<volume options="rw,nosuid,nodev,iocharset=utf8" user="*" mountpoint="@@cdsdir@@" path="cdrom" server="@@serverip@@" fstype="cifs" />
 
-<volume options="rw,nosuid,nodev,wsize=8192,rsize=8192" user="*" mountpoint="@@taskscache@@" path="tasks" server="@@serverip@@" fstype="cifs" />
+<volume options="rw,nosuid,nodev,iocharset=utf8" user="*" mountpoint="@@taskscache@@" path="tasks" server="@@serverip@@" fstype="cifs" />
 
-<volume options="rw,nosuid,nodev,wsize=8192,rsize=8192" user="*" mountpoint="@@backupmntpoint@@" path="backup" server="@@serverip@@" fstype="cifs" />
+<volume options="rw,nosuid,nodev,iocharset=utf8" user="*" mountpoint="@@backupmntpoint@@" path="backup" server="@@serverip@@" fstype="cifs" />
 
 </pam_mount>

client/linuxmuster-client/trunk/share/helperfunctions.sh

@@ -14 +14 @@
 # get user homedir
 get_userhome() {
-        userhomecache=/tmp/.home-$USER
+        local userhomecache=/tmp/.home-$USER
         if [ ! -s "$userhomecache" ]; then
                 getent passwd $USER | cut -f6 -d: > $userhomecache
@@ -25 +25 @@
 # checking if directory is empty, in that case it returns 0
 check_empty_dir() {
-  unset RET
+  local RET
   RET=$(ls -A1 $1 2>/dev/null | wc -l)
-  [ "$RET" = "0" ] && return 0
-  return 1
+  return $RET
 }
 

client/linuxmuster-client/trunk/share/mount.sh

@@ -63 +63 @@
 done
 
-# handle .cache and .gvfs
-for i in .cache .gvfs; do
- [ -e "/tmp/${i}-${USER}" ] && rm -rf /tmp/${i}-${USER}
- [ -e "$HOME/$i" ] && rm -rf $HOME/$i
- mkdir -p /tmp/${i}-${USER}
- chown $USER /tmp/${i}-${USER}
- chmod 700 /tmp/${i}-${USER}
- ln -s /tmp/${i}-${USER} $HOME/${i}
-done
-
-# remove .pulse dir
-rm -rf $HOME/.pulse
-

client/linuxmuster-client/trunk/share/umount.sh

@@ -58 +58 @@
  done
 
- # handle .cache and .gvfs
- for i in .cache .gvfs; do
-  [ -e "/tmp/${i}-${USER}" ] && rm -rf /tmp/${i}-${USER}
-  [ -e "$HOME/$i" ] && rm -rf $HOME/$i
- done
-
 fi