From 435d181aed179d930571da5154988a997fd53145 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 1 Jul 2007 12:07:25 +0000
Subject: Cleanups and simplifications ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1201 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/bin/servconfig | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 98bb6943..66fe5099 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -69,12 +69,12 @@ else
 fi
 while [ $len -le $smax ] ; do
   vdstr="$vdstr "
-  len=$(expr $len + 1)
+  len=$(($len + 1))
 done
 len=$(expr length $host_name)
 while [ $len -le 30 ] ; do
   space="$space "
-  len=$(expr $len + 1)
+  len=$(($len + 1))
 done
 echo "
    WELCOME TO                 $space        \n (\l)
@@ -135,8 +135,11 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
     ;;
     *)
     # we expect nfs mounts here ...
-    nfsmnt ${vmimgserv}:${vmimgpath} /mnt/var/lib/vmware || {
-      error "${scfg_nfs}" nonfatal; noimg=yes; }
+    for proto in tcp udp fail; do
+      [ $proto = "fail" ] && { error "$scfg_nfs" nonfatal; noimg=yes; break;}
+      mount -n -t nfs -o ro,nolock,$proto ${vmimgserv}:${vmimgpath} \
+        /mnt/var/lib/vmware && break
+    done
     ;;
   esac
   # if only the path is given expect a local source within exported
-- 
cgit v1.2.3-55-g7522