Cleanups and simplifications ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1201 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 12 insertions, 9 deletions

diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index 1fce58ff..ce832426 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -285,18 +285,18 @@ fi
 [ $DEBUGLEVEL -eq 21 ] && echo "** 1st hwdetection finished at $(sysup)"
 # load ide drivers first, takes a while to initialize
 for driver in cmd64x hpt366 piix slc90e66 cs5520 it821x rz1000 \
-    ahci triflex aec62xx cs5530 ns87415 sc1200 trm290 alim15x3 \
+    ahci triflex aec62xx cs5530 cs5535 ns87415 sc1200 trm290 alim15x3 \
     cy82c693 opti621 serverworks via82cxxx amd74xx pata_amd \
     pdc202xx_new siimage atiixp hpt34x pdc202xx_old sis5513; do
   strinfile " ${driver}" /tmp/hwsetup.info && {
     ide="yes"
-    #modwaittime=$(expr 10 + ${modwaittime})
+    #modwaittime=$((10 + ${modwaittime}))
     modprobe ${MODPRV} ${driver} &
     driverlist="${driverlist} ${driver}"; usleep ${modwaittime}; }
 done
-# check for IDE/SCSI (SATA)
-for driver in ata_piix sata_via sata_nv sata_sil sata_sis sata_svw \
-    sata_sx4 sata_uli sata_vsc sata_qstor sata_promise sata_mv ahci; do
+# check for IDE/SCSI (SATA); changes in newer kernels prefix pata/sata
+for driver in ata_piix sata_via sata_mv sata_nv sata_sil sata_sis sata_svw \
+    sata_sx4 sata_uli sata_vsc sata_qstor sata_promise ahci; do
   strinfile " ${driver}" /tmp/hwsetup.info && {
     #SCSIIDE="yes"
     modprobe ${MODPRV} ${driver} &
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