From bc6a3d6a230c542588732d09cc38bddfb2fbd8e4 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 23 Aug 2008 23:55:21 +0000
Subject: Several fixes, improvements: * clean the nfs mounted /tmp (Detlef
 pointed out several   problems here) * kill the debug shell if started in
 stage3, closes #261 * small fix on config_nis in suse/functions-default *
 mount /var/cache/fontconfig in SuSE10.2 too (speeds up   gdm start)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2089 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/bin/servconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'initramfs/stage3-stuff/bin/servconfig')

diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig
index 23d5dbee..707f91b9 100755
--- a/initramfs/stage3-stuff/bin/servconfig
+++ b/initramfs/stage3-stuff/bin/servconfig
@@ -278,8 +278,11 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then
       # should be configured ... it is possible to mount "nolock" only
       mount -t nfs -o rw,tcp,nolock,intr,nodev,soft,timeo=2,nosuid \
         ${tmpserv}:${tmppath} /tmp/scratch >/dev/null 2>&1 && {
+        if [ -d /tmp/scratch/${clientip} ] ; then
+          mv /tmp/scratch/${clientip} /tmp/scratch/${clientip}.totrash
+          rm -rf /tmp/scratch/${clientip}.totrash 2>/dev/null &
+        fi
         testmkd /tmp/scratch/${clientip}
-        umount /tmp/scratch
         # no need for tempfs there ...
         umount /mnt/tmp >/dev/null 2>&1
         mount -t nfs -o rw,tcp,nolock,intr,nodev,soft,timeo=2,nosuid \
-- 
cgit v1.2.3-55-g7522