diff options
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 1 | ||||
| -rwxr-xr-x | vmware/runvmware | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 43ed0796..d494b107 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -437,6 +437,7 @@ if [ "x$start_x" != "xno" ] ; then /tmp/.ICE-unix \ /tmp/.X11-unix ; do testmkd /mnt/$i; done chmod 1777 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix + chown 0:0 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix echo "# file emtied by $0 during initramfs" > /mnt/etc/X11/xdm/Xservers # define additional sessions offered to the user (via dhcp/ldap config) # descsession -> deprecated by new vmware integration concept diff --git a/vmware/runvmware b/vmware/runvmware index 9966be74..6e4e5fb7 100755 --- a/vmware/runvmware +++ b/vmware/runvmware @@ -164,7 +164,15 @@ version=$(head -n 15 $0 | grep "# Version: " | awk '{print $3}') # hardware variables # temporary disk space for logs, etc... -export tmpdir=/tmp/${USER} +preftmpdir=/tmp/${USER} +# there are two different kinds of tmp needed: +# user config -> preferences for all *.vmx (especially that hidden ram image) +# and per vmx config (written to runvmware.conf) +if cat /proc/mounts|grep -e " /tmp" 2>/dev/null| grep -e "nfs" &>/dev/null + then export tmpdir=/dev/shm/vmware +else + export tmpdir=$preftmpdir +fi mac= declare -i mem=0 @@ -591,11 +599,12 @@ done # create environment # remove leftover locks from former runs, # problems may occure if you run more then one vmware with this script -rm -f ${tmpdir}/*LOCK >/dev/null 2>&1 +rm -f ${tmpdir}/*LOCK ${preftmpdir} >/dev/null 2>&1 rm -f ${tmpdir}/*.${debug}.log >/dev/null 2>&1 # create vmware directories mkdir -p ${tmpdir} >/dev/null 2>&1 +mkdir -p ${preftmpdir} >/dev/null 2>&1 mkdir -p ${vmhome} >/dev/null 2>&1 # NO X-server no runvmware ;) |