diff options
Diffstat (limited to 'defaultenv')
| -rw-r--r-- | defaultenv/bin/boot | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot index d37eca86a5..1566c6a7d7 100644 --- a/defaultenv/bin/boot +++ b/defaultenv/bin/boot @@ -40,6 +40,15 @@ elif [ x$mode = xdisk ]; then fi if [ x$ip = xdhcp ]; then + if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then + dhcp + if [ x$rootpath != x ]; then + nfsroot=$rootpath + fi + if [ x$bootfile != x ]; then + kernelimage=$bootfile + fi + fi bootargs="$bootargs ip=dhcp" elif [ x$ip = xnone ]; then bootargs="$bootargs ip=none" @@ -89,9 +98,6 @@ if [ -n $mtdparts ]; then fi if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then - if [ x$ip = xdhcp ]; then - dhcp - fi kdev=/image $kernel_loc $kernelimage $kdev || exit 1 elif [ x$kernel_loc = xnor ]; then |