summaryrefslogtreecommitdiffstats
path: root/defaultenv
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-08-15 15:23:17 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-02 08:57:07 +0200
commit91b563613e5c831998210a2c500ec4d2492a650b (patch)
treeac3c8166fcbddbc781c0ef04fa7a43a4fe33f3d9 /defaultenv
parent3facad280b185d419cd554c69e0c0577253c028b (diff)
downloadbarebox-91b563613e5c831998210a2c500ec4d2492a650b.tar.gz
dhcp: switch to global var support
This way you can specify as previously set the dhcp parameter via global.dhcp.xxx and get the result via global.dhcp.xxx This is need for the defaultenv-2 to add the bootp suppport. Use it on defaultenv too to have only one set of var. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'defaultenv')
-rw-r--r--defaultenv/bin/boot12
-rw-r--r--defaultenv/config2
2 files changed, 7 insertions, 7 deletions
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index 61b893a..c17ccdb 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -44,14 +44,14 @@ fi
if [ x$ip = xdhcp -o x$ip = "xdhcp-barebox" ]; then
if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then
dhcp
- if [ x$rootpath != x ]; then
- nfsroot=$rootpath
+ if [ x${global.dhcp.rootpath} != x ]; then
+ nfsroot=${global.dhcp.rootpath}
fi
- if [ x$bootfile != x ]; then
- kernelimage=$bootfile
+ if [ x${global.dhcp.bootfile} != x ]; then
+ kernelimage=${global.dhcp.bootfile}
fi
- if [ x$dhcp_oftree_file != x ]; then
- oftreeimage=$dhcp_oftree_file
+ if [ x$global.dhcp.oftree_file} != x ]; then
+ oftreeimage=${global.dhcp.oftree_file}
fi
fi
fi
diff --git a/defaultenv/config b/defaultenv/config
index 81d6f95..391ba47 100644
--- a/defaultenv/config
+++ b/defaultenv/config
@@ -11,7 +11,7 @@ fi
# use 'dhcp' to do dhcp in barebox and in kernel
# use 'none' if you want to skip kernel ip autoconfiguration
ip=dhcp
-dhcp_vendor_id=barebox
+global.dhcp.vendor_id=barebox
# or set your networking parameters here
#eth0.ipaddr=a.b.c.d