diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
| commit | 2a17e75a976d11c1712972d29813094b8020ac35 (patch) | |
| tree | ea0e991c927752937803d72a5411f7159365aa83 /defaultenv | |
| parent | a5f75fe8175aefec5b7cefaadc5359096c8eb22c (diff) | |
| parent | 7185b353c96e1e831533eeaaada06ad9bebf84a2 (diff) | |
| download | barebox-2a17e75a976d11c1712972d29813094b8020ac35.tar.gz barebox-2a17e75a976d11c1712972d29813094b8020ac35.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'defaultenv')
| -rw-r--r-- | defaultenv/defaultenv-2-base/boot/net | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/defaultenv/defaultenv-2-base/boot/net b/defaultenv/defaultenv-2-base/boot/net index f8895290ad..e79432eb27 100644 --- a/defaultenv/defaultenv-2-base/boot/net +++ b/defaultenv/defaultenv-2-base/boot/net @@ -2,6 +2,9 @@ path="/mnt/tftp" +# global.net.server and global.hostname may be set by DHCP, so trigger it first +ifup -a + global.bootm.image="${path}/${global.user}-linux-${global.hostname}" oftree="${path}/${global.user}-oftree-${global.hostname}" @@ -15,13 +18,11 @@ if [ $? != 0 ]; then exit 1 fi -nfsroot="${nfsserver}:/home/${global.user}/nfsroot/${global.hostname}" - -ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip - initramfs="${path}/${global.user}-initramfs-${global.hostname}" if [ -f "${initramfs}" ]; then global.bootm.initrd="$initramfs" else + nfsroot="${nfsserver}:/home/${global.user}/nfsroot/${global.hostname}" + ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" fi |