From 68ead79ec59605ac81b5a68d9f4d313b5fcadcf7 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 28 Mar 2011 16:49:45 +0200
Subject: Some changes for Ubuntu 10.10 ...

---
 src/initramfs/scripts/etc/functions | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/initramfs/scripts/etc')

diff --git a/src/initramfs/scripts/etc/functions b/src/initramfs/scripts/etc/functions
index 717a9c10..b1b82d24 100644
--- a/src/initramfs/scripts/etc/functions
+++ b/src/initramfs/scripts/etc/functions
@@ -155,12 +155,15 @@ case "${proto}" in
     # we expect nfs mounts here ... check that nfs module is loaded before
     cat /proc/filesystems | grep -q -E "[[:space:]]nfs" || \
       { modprobe ${MODPRV} nfs 2>/dev/null || error "$error_nfsmod" nonfatal; }
-    for transport in tcp udp fail; do
-      [ $transport = "fail" ] && { error "$init_nfs" nonfatal;
-         noimg=yes; break;}
-       mount -n -t nfs -o ${mntopt},nolock,${transport} \
-         ${server}:${srcpath} ${target} && break
-    done
+    # nfs4 seems not supported yet by busybox mount (to be checked)
+    #for nfsproto in nfs4 nfs; do
+      for transport in tcp udp fail; do
+        [ $transport = "fail" ] && { error "$init_nfs" nonfatal;
+           noimg=yes; break; }
+         mount -n -t nfs -o ${mntopt},nolock,${transport} \
+           ${server}:${srcpath} ${target} && break
+      done
+    #done
   ;;
   smb|cifs)
     # cifs mounts might be problematic if accessed with superuser id
-- 
cgit v1.2.3-55-g7522