From: Harald Hoyer <harald@redhat.com>
Date: Mon, 25 May 2009 13:28:56 +0000 (+0200)
Subject: use 40nfsroot instead of 95NFS
X-Git-Tag: 0.1~189
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e14fae0fef66cfcc8325711d3bf6c49a058098b;p=thirdparty%2Fdracut.git

use 40nfsroot instead of 95NFS
---

diff --git a/modules.d/95NFS/install b/modules.d/95NFS/install
deleted file mode 100755
index effdf2f71..000000000
--- a/modules.d/95NFS/install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-inst mount.nfs
-inst_hook pre-mount 99 "$moddir/nfs-parse-root-opts.sh"
-instmods nfs
diff --git a/modules.d/95NFS/nfs-parse-root-opts.sh b/modules.d/95NFS/nfs-parse-root-opts.sh
deleted file mode 100755
index 06228a845..000000000
--- a/modules.d/95NFS/nfs-parse-root-opts.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# exit if rootfstype is set and not nfs
-if [ -z "$fstype" -o "$fstype" = "nfs" ]; then
-    if [ "$root" = "dhcp" ]; then 
-	for dev in /net.*.dhcpopts; do 
-	    if [ -f "$dev" ]; then 
-		. "$dev"
-		[ -n "$new_root_path" ] && nfsroot="$new_root_path"
-		if [ ! -s /.resume -a -n "$nfsroot" ]; then
-		    if [ "${nfsroot#nfs://}" != "$nfsroot" ]; then
-			nfsroot="${nfsroot#nfs://}"
-			nfsroot="${nfsroot/\//:/}"
-		    fi
-		    break
-		fi
-	    fi
-	done
-    elif [ "${root#/dev/}" = "$root" -a "${root#*:/}" != "$root" ]; then
-	nfsroot="$root"
-    fi
-
-    # let user force override nfsroot
-    nfsroot_cmdl=$(getarg 'nfsroot=') 
-    [ -n "$nfsroot_cmdl" ] && nfsroot="$nfsroot_cmdl"
-
-    if [ -n "$nfsroot" ]; then
-	root="$nfsroot" 
-	fstype="-t nfs"
-	
-	if rflags="$(getarg rootflags=)"; then
-	    getarg rw && rflags="${rflags},rw" || rflags="${rflags},ro"
-	else
-	    getarg rw && rflags=rw || rflags=ro
-	fi
-
-	rflags="nolock,$rflags"
-    fi
-fi