diff options
| author | Toomas Soome <tsoome@me.com> | 2016-12-21 19:25:55 +0200 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2016-12-27 12:01:19 -0500 |
| commit | 21293435fe93fde4bf97ba97c98560f9299a97f6 (patch) | |
| tree | 906ce4fdf40204b62bbfc1f3e6d42e072c65281d | |
| parent | 1e3b90b08c46284a9abda475fbd0124dd2689de5 (diff) | |
| download | illumos-joyent-21293435fe93fde4bf97ba97c98560f9299a97f6.tar.gz | |
7683 loader: conf.d reader needs to check for boot.tftproot.server
Reviewed by: Adam Števko <adam.stevko@gmail.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/boot/sys/boot/forth/support.4th | 13 |
1 files 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 |