diff options
| author | Toomas Soome <tsoome@me.com> | 2017-05-06 14:56:43 +0300 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2017-05-27 22:21:03 -0400 |
| commit | 84e6955df14dc7f06618ed336ac0a78ba258feb6 (patch) | |
| tree | 11fe4cfdcd4dc1a18fab675ed41a3febfadeb62b /usr/src/boot/lib/libstand/bootp.c | |
| parent | d993cb83958d44b76c7c56393113c24811dde5f7 (diff) | |
| download | illumos-joyent-84e6955df14dc7f06618ed336ac0a78ba258feb6.tar.gz | |
8171 loader: distinguish NFS versus TFTP boot by rootpath
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/boot/lib/libstand/bootp.c')
| -rw-r--r-- | usr/src/boot/lib/libstand/bootp.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/usr/src/boot/lib/libstand/bootp.c b/usr/src/boot/lib/libstand/bootp.c index effe074dce..98ecb2750b 100644 --- a/usr/src/boot/lib/libstand/bootp.c +++ b/usr/src/boot/lib/libstand/bootp.c @@ -145,16 +145,15 @@ bootp(int sock, int flag) bp->bp_vend[8] = 9; bcopy("PXEClient", &bp->bp_vend[9], 9); bp->bp_vend[18] = TAG_PARAM_REQ; - bp->bp_vend[19] = 8; + bp->bp_vend[19] = 7; bp->bp_vend[20] = TAG_ROOTPATH; - bp->bp_vend[21] = TAG_TFTP_SERVER; - bp->bp_vend[22] = TAG_HOSTNAME; - bp->bp_vend[23] = TAG_SWAPSERVER; - bp->bp_vend[24] = TAG_GATEWAY; - bp->bp_vend[25] = TAG_SUBNET_MASK; - bp->bp_vend[26] = TAG_INTF_MTU; - bp->bp_vend[27] = TAG_SERVERID; - bp->bp_vend[28] = TAG_END; + bp->bp_vend[21] = TAG_HOSTNAME; + bp->bp_vend[22] = TAG_SWAPSERVER; + bp->bp_vend[23] = TAG_GATEWAY; + bp->bp_vend[24] = TAG_SUBNET_MASK; + bp->bp_vend[25] = TAG_INTF_MTU; + bp->bp_vend[26] = TAG_SERVERID; + bp->bp_vend[27] = TAG_END; } else bp->bp_vend[7] = TAG_END; #else @@ -426,10 +425,6 @@ vend_rfc1048(u_char *cp, u_int len) bcopy(cp, &dhcp_serverip.s_addr, sizeof(dhcp_serverip.s_addr)); } - if (tag == TAG_TFTP_SERVER) { - bcopy(cp, &tftpip.s_addr, - sizeof(tftpip.s_addr)); - } #endif cp += size; } |