If the symlink is not find on barebox try on the host.
So we are back compatible with nfs command.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
---
defaultenv-2/base/boot/nfs | 64 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 61 insertions(+), 3 deletions(-)
diff --git a/defaultenv-2/base/boot/nfs b/defaultenv-2/base/boot/nfs
index 892f103..bf27d38 100644
--- a/defaultenv-2/base/boot/nfs
+++ b/defaultenv-2/base/boot/nfs
@@ -5,6 +5,8 @@ if [ "$1" = menu ]; then
exit
fi
+. /env/data/ansi-colors
+
path="/mnt/tftp"
# to get the dhcp info (global.dhcp.rootpath, global.dhcp.bootfile, global.dhcp.oftree_file)
@@ -44,6 +46,24 @@ if [ -n "${global.dhcp.bootfile}" ]; then
mount -t nfs "${eth0.serverip}:${mnt}" "${path}"
global.bootm.image="${path}/${bootfile}"
+
+ if [ -L "${global.bootm.image}" ]; then
+ readlink -f "${global.bootm.image}" bootfile_symlink
+
+ # if the file is not on barebox fs assume it's on the host
+ if [ ! -e "${bootfile_symlink}" ]; then
+ dirname "${bootfile_symlink}" mnt
+ basename "${bootfile_symlink}" bootfile
+
+ umount "${path}"
+ mount -t nfs "${eth0.serverip}:${mnt}" "${path}"
+
+ bootfile_symlink="${path}/${bootfile_symlink}"
+ global.bootm.image="${path}/${bootfile}"
+ else
+ global.bootm.image="${bootfile_symlink}"
+ fi
+ fi
fi
if [ -n "${global.dhcp.oftree_file}" ]; then
@@ -62,13 +82,51 @@ if [ -n "${global.dhcp.oftree_file}" ]; then
mount -t nfs "${eth0.serverip}:${mnt}" "${path}"
global.bootm.oftree="${path}/${bootfile}"
+
+ if [ -L "${global.bootm.oftree}" ]; then
+ readlink -f "${global.bootm.oftree}" oftree_symlink
+
+ # if the file is not on barebox fs assume it's on the host
+ if [ ! -e "${oftree_symlink}" ]; then
+ dirname "${oftree_symlink}" mnt
+ basename "${oftree_symlink}" bootfile
+
+ umount "${path}"
+ mount -t nfs "${eth0.serverip}:${mnt}" "${path}"
+
+ oftree_symlink="${path}/${oftree_symlink}"
+ global.bootm.oftree="${path}/${bootfile}"
+ else
+ global.bootm.oftree="${oftree_symlink}"
+ fi
+ fi
fi
if [ x${bootp} = x1 ]; then
echo "Boot via bootp/dhcp on server ${eth0.serverip}"
- [ -n "${global.dhcp.bootfile}" ] && echo "bootm.image => ${global.dhcp.bootfile}"
- [ -n "${global.dhcp.oftree_file}" ] && echo "bootm.oftree => ${global.dhcp.oftree_file}"
- [ -n "${global.dhcp.rootpath}" ] && echo "nfsroot => ${global.dhcp.rootpath}"
+ if [ -n "${global.dhcp.bootfile}" ]; then
+ echo -n "bootm.image => "
+ if [ "x${bootfile_symlink}" != x ]; then
+ echo -e -n "${CYAN}${global.dhcp.bootfile}${NC}"
+ echo -n " -> ${bootfile_symlink}"
+ else
+ echo -n "${global.dhcp.bootfile}"
+ fi
+ echo ""
+ fi
+
+ if [ -n "${global.dhcp.oftree_file}" ]; then
+ echo "bootm.oftree => "
+ if [ "x${oftree_symlink}" != x ]; then
+ echo -e -n "${CYAN}${global.dhcp.oftree_file}${NC}"
+ echo -n " -> ${oftree_symlink}"
+ else
+ echo -n "${global.dhcp.oftree_file}"
+ fi
+ echo ""
+ fi
+
+ [ -n "${global.dhcp.rootpath}" ] && echo "nfsroot -> ${global.dhcp.rootpath}"
fi
bootargs-ip
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
