diff --git a/defaultenv/defaultenv-2-base/bin/bootargs-ip b/defaultenv/defaultenv-2-base/bin/bootargs-ip deleted file mode 100644 index 2d4486c..0000000 --- a/defaultenv/defaultenv-2-base/bin/bootargs-ip +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# pass either static ip or dhcp to kernel based on barebox settings - -. /env/network/eth0 - -if [ $ip = dhcp ]; then - global.linux.bootargs.dyn.ip="ip=dhcp" -else - global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:" -fi diff --git a/defaultenv/defaultenv-2-base/boot/net b/defaultenv/defaultenv-2-base/boot/net index af09641..aaa5394 100644 --- a/defaultenv/defaultenv-2-base/boot/net +++ b/defaultenv/defaultenv-2-base/boot/net @@ -10,7 +10,8 @@ fi nfsroot="/home/${global.user}/nfsroot/${global.hostname}" -bootargs-ip + +ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip initramfs="${path}/${global.user}-initramfs-${global.hostname}" if [ -f "${initramfs}" ]; then