diff options
author | Toomas Soome <tsoome@me.com> | 2016-11-09 12:26:44 +0200 |
---|---|---|
committer | Dan McDonald <danmcd@omniti.com> | 2016-12-21 15:37:26 -0500 |
commit | aa61755ec0c079ce801724a2c40b69deaa46822b (patch) | |
tree | d9b953648879ac4aa95fa18f4b6ab43404a7e7cb /usr/src/boot/lib/libstand/tftp.c | |
parent | 0c94e1af6784c69a1dea25e0e35dd13b2b91e2e5 (diff) | |
download | illumos-joyent-aa61755ec0c079ce801724a2c40b69deaa46822b.tar.gz |
7567 Netboot: allow both tftpfs and nfs in both pxeboot and loader.efi
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Adam Števko <adam.stevko@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/boot/lib/libstand/tftp.c')
-rw-r--r-- | usr/src/boot/lib/libstand/tftp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/boot/lib/libstand/tftp.c b/usr/src/boot/lib/libstand/tftp.c index cb84970910..b3d2da7b0e 100644 --- a/usr/src/boot/lib/libstand/tftp.c +++ b/usr/src/boot/lib/libstand/tftp.c @@ -402,6 +402,9 @@ tftp_open(const char *path, struct open_file *f) size_t pathsize; const char *extraslash; + if (netproto != NET_TFTP) + return (EINVAL); + if (strcmp(f->f_dev->dv_name, "net") != 0) { #ifdef __i386__ if (strcmp(f->f_dev->dv_name, "pxe") != 0) |