From 21293435fe93fde4bf97ba97c98560f9299a97f6 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Wed, 21 Dec 2016 19:25:55 +0200 Subject: [PATCH] =?utf8?q?7683=20loader:=20conf.d=20reader=20needs=20to=20?= =?utf8?q?check=20for=20boot.tftproot.server=20Reviewed=20by:=20Adam=20?= =?utf8?q?=C5=A0tevko=20=20Reviewed=20by:=20Robert?= =?utf8?q?=20Mustacchi=20=20Approved=20by:=20Richard=20Lowe?= =?utf8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- usr/src/boot/sys/boot/forth/support.4th | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/usr/src/boot/sys/boot/forth/support.4th b/usr/src/boot/sys/boot/forth/support.4th index 95848c5416..16b8a88846 100644 --- a/usr/src/boot/sys/boot/forth/support.4th +++ b/usr/src/boot/sys/boot/forth/support.4th @@ -1146,10 +1146,15 @@ string current_file_name_ref \ used to print the file name ; : scan_conf_dir ( -- addr len -1 | 0 ) - s" currdev" getenv dup -1 <> if - s" pxe0:" compare 0= if 0 exit then \ readdir does not work on tftp - else - drop + s" currdev" getenv -1 <> if + dup 3 \ we only need first 3 chars + s" pxe" compare 0= + swap 3 + s" net" compare 0= or if + s" boot.tftproot.server" getenv? if + 0 exit \ readdir does not work on tftp + then + then then ['] entries catch if -- 2.11.4.GIT