On Fri, Sep 07, 2012 at 02:13:35PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Given that the bootp support seems to have nearly nothing in common
with the boot/net file wouldn't it be better to just add a new file
boot/bootp?
Sascha
> ---
> defaultenv-2/base/boot/net | 35 ++++++++++++++++++++++++++++++++++-
> 1 file changed, 34 insertions(+), 1 deletion(-)
>
> diff --git a/defaultenv-2/base/boot/net b/defaultenv-2/base/boot/net
> index 922bef1..ff05077 100644
> --- a/defaultenv-2/base/boot/net
> +++ b/defaultenv-2/base/boot/net
> @@ -7,8 +7,41 @@ fi
>
> path="/mnt/tftp"
>
> +# to get the dhcp info (global.dhcp.rootpath, global.dhcp.bootfile, global.dhcp.oftree_file)
> +ifdown eth0
> +ifup eth0
> +
> global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
> #global.bootm.oftree="${path}/${global.user}-oftree-${global.hostname}"
> -nfsroot="/home/${global.user}/nfsroot/${global.hostname}"
> +
> +if [ -n "${global.dhcp.rootpath}" ]; then
> + bootp=1
> + nfsroot="${global.dhcp.rootpath}"
> +else
> + nfsroot="/home/${global.user}/nfsroot/${global.hostname}"
> +fi
> +
> +if [ -n "${global.dhcp.bootfile}" -o -n "${global.dhcp.oftree_file}" ]; then
> + bootp=1
> + path="/mnt/dhcp"
> +
> + if [ -d "${path}" ]; then
> + umount "${path}"
> + else
> + mkdir "${path}"
> + fi
> + mount -t tftp $eth0.serverip "${path}"
> +
> + [ -n "${global.dhcp.bootfile}" ] && global.bootm.image="${path}/${global.dhcp.bootfile}"
> + [ -n "${global.dhcp.oftree_file}" ] && global.bootm.oftree="${path}/${global.dhcp.oftree_file}"
> +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}"
> +fi
> +
> bootargs-ip
> bootargs-root-nfs -n "$nfsroot"
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
