From bb98536c4c1b597ed326c8729e048eac5526869b Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Sun, 27 May 2007 00:43:18 +0200
Subject: scripts/nfs: fix when root-path includes server-ip

---
 scripts/nfs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'scripts/nfs')

diff --git a/scripts/nfs b/scripts/nfs
index 5eb17bf..717dfe8 100644
--- a/scripts/nfs
+++ b/scripts/nfs
@@ -41,7 +41,13 @@ do_nfsmount()
 
 	# get nfs root from dhcp
 	if [ "x${NFSROOT}" = "xauto" ]; then
-		NFSROOT=${ROOTSERVER}:${ROOTPATH}
+		# check if server ip is part of dhcp root-path
+		if [ "${ROOTPATH#*:}" = "${ROOTPATH}" ]; then
+			NFSROOT=${ROOTSERVER}:${ROOTPATH}
+		else
+			NFSROOT=${ROOTPATH}
+		fi
+
 	# nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
 	elif [ -n "${NFSROOT}" ]; then
 		# nfs options are an optional arg
-- 
cgit v1.2.3