[PATCH 1/2] defaultenv: add bootp support

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Tue Mar 13 13:45:06 EDT 2012


use rootpath as nfsroot and bootfile as kernelimage if present
when ip mode is dhcp

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 defaultenv/bin/boot |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index d37eca8..1566c6a 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -40,6 +40,15 @@ elif [ x$mode = xdisk ]; then
 fi
 
 if [ x$ip = xdhcp ]; then
+	if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then
+		dhcp
+		if [ x$rootpath != x ]; then
+			nfsroot=$rootpath
+		fi
+		if [ x$bootfile != x ]; then
+			kernelimage=$bootfile
+		fi
+	fi
 	bootargs="$bootargs ip=dhcp"
 elif [ x$ip = xnone ]; then
 	bootargs="$bootargs ip=none"
@@ -89,9 +98,6 @@ if [ -n $mtdparts ]; then
 fi
 
 if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then
-	if [ x$ip = xdhcp ]; then
-		dhcp
-	fi
 	kdev=/image
 	$kernel_loc $kernelimage $kdev || exit 1
 elif [ x$kernel_loc = xnor ]; then
-- 
1.7.7




More information about the barebox mailing list