diff options
| author | Stephen J. Kiernan <stevek@FreeBSD.org> | 2020-07-31 16:08:25 +0000 |
|---|---|---|
| committer | Stephen J. Kiernan <stevek@FreeBSD.org> | 2020-07-31 16:08:25 +0000 |
| commit | fafe230db0cd8d96ac5f3f74643e0c71e949d623 (patch) | |
| tree | 63af356a5925bc54fe8cf001e7c48c5f34039cf8 /stand/common/install.c | |
| parent | 0b87619ffeabf8bc516ab2064b964077099ffc75 (diff) | |
| download | src-fafe230db0cd8d96ac5f3f74643e0c71e949d623.tar.gz src-fafe230db0cd8d96ac5f3f74643e0c71e949d623.zip | |
Fix compilation error for install.c in loader
Fix typo in interp_include() invocation (missing 'p')
Remove setting tftpip, as servip is used by the tftp code in libsa. There
is no separate tftpip global variable any more.
Obtained from: Juniper Networks, Inc.
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D25897
Notes
Notes:
svn path=/head/; revision=363738
Diffstat (limited to 'stand/common/install.c')
| -rw-r--r-- | stand/common/install.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/stand/common/install.c b/stand/common/install.c index de0fd88fc4e3..ea6eaaa7cebc 100644 --- a/stand/common/install.c +++ b/stand/common/install.c @@ -286,10 +286,6 @@ install(char *pkgname) setenv("serverip", inet_ntoa(servip), 1); - if (proto == &tftp_fsops) { - tftpip.s_addr = servip.s_addr; - } - *pkgname = '/'; } else pkgname = s; @@ -340,7 +336,7 @@ install(char *pkgname) fd = open(s, O_RDONLY); if (fd != -1) { close(fd); - error = inter_include(s); + error = interp_include(s); if (error == CMD_ERROR) goto fail; } |