From 494d472f83758f41e6f38b9b63fc42e79c5d3635 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 25 Mar 2006 16:17:31 +0000
Subject: ensured "ash" compatibility, minor fixes and cleanups, ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@128 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/servconfig | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'initrd/initrd-stuff/bin/servconfig')

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 6de5ba48..2be55ba7 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -192,19 +192,24 @@ config_snmp 24 02
 # create needed directories and files
 if [ "x$vmware" != "x" ] || [ "x$vmware" != "xno" ] ; then
   # in the future other types of sources besides NFS should be supported
-  mount -t nfs -o ro,nolock,intr,nodev,soft,timeo=2,nosuid \
-    ${imgsrv} /mnt/${vmdir} &
+  for i in /var/lib/vmware /etc/vmware/vmnet1 /etc/vmware/vmnet8 \
+           /var/run/vmware ; do
+    testmkd /mnt/$i
+  done
+  # mount the vmware image source or link it (compatibility to ver. 3)
+  if [ -d /mnt/usr/share/vmware ] ; then
+    ln -sf /usr/share/vmware /var/lib/vmware
+  elif [ -n "${imgsrv}" ] ; then
+    mount -t nfs -o ro,nolock,intr,nodev,soft,timeo=2,nosuid \
+      ${imgsrv} /mnt/var/lib/vmware &
+  fi
   # generate a runlevel script
-  d_mkrlscript init vmware-prep "Starting preparation of vmware environment"
+  d_mkrlscript init vmware-prep 'Starting preparation of vmware environment'
   sed "s,^#.*,,;/^$/d;s,^,\t," /etc/vmware-prep >> \
     /mnt/etc/${D_INITDIR}/vmware-prep
   d_mkrlscript close vmware-prep ""
   chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep
   config_vmware
-  for i in /var/lib/vmware /etc/vmware/vmnet1 /etc/vmware/vmnet8 \
-           /var/run/vmware ; do
-    testmkd /mnt/$i
-  done
   chmod 1777 /mnt/var/run/vmware
   rm /mnt/etc/vmware/not_configured 2>/dev/null
   # define a variable where gdm/kdm should look for additional sessions
-- 
cgit v1.2.3-55-g7522