From f88180a0286334ec87f4c386e3aaf598b79c4223 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 14 Oct 2007 00:55:45 +0000
Subject: Proper mount options for NFS/scratch ... Skip some files for SUSE
 exports.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1381 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/bin/servconfig     | 10 ++++++----
 installer/OpenSLX/OSExport/Distro/SUSE.pm |  6 ++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 3bcf5e16..d26a4213 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -472,12 +472,14 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then
     tmpserv=$(uri_token $scratch server)
     tmppath=$(uri_token $scratch path)
     # hanging mount processes might stop further setup - timeout
-    # should be configured ...
-    mount -t nfs -o rw,nolock,intr,nodev,soft,timeo=2,nosuid \
+    # 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 && {
-      mkdir -p /tmp/scratch/${clientip} >/dev/null 2>&1
+      testmkd /tmp/scratch/${clientip}
       umount /tmp/scratch
-      mount -t nfs -o rw,nolock,intr,nodev,soft,timeo=2,nosuid \
+      # 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 \
         ${tmpserv}:${tmppath}/${clientip} /mnt/tmp >/dev/null 2>&1; }
     ;;
   esac
diff --git a/installer/OpenSLX/OSExport/Distro/SUSE.pm b/installer/OpenSLX/OSExport/Distro/SUSE.pm
index 6a5fdbe0..4d16c2cf 100644
--- a/installer/OpenSLX/OSExport/Distro/SUSE.pm
+++ b/installer/OpenSLX/OSExport/Distro/SUSE.pm
@@ -53,10 +53,16 @@ sub initDistroInfo
 		- /var/lib/hardware/*
 		- /var/lib/gdm/*
 		- /var/lib/dhcp*
+		- /var/lib/bluetooth/
 		- /var/lib/YaST2/you/mnt/*
+		- /var/lib/YaST2/backup_boot_sectors
+		- /var/cache/sax
+		- /var/cache/libx11/compose/*
+		- /var/cache/beagle
 		- /var/cache/yum
 		- /var/cache/man/*
 		- /var/adm/backup/rpmdb/*
+		- /var/adm/mount/AP*
 		- /var/adm/SuSEconfig
 		- /usr/share/vmware/*
 		- /usr/lib/zen-updater
-- 
cgit v1.2.3-55-g7522