git: c494a0c50da9 - stable/12 - Fix compilation error for install.c in loader
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Oct 2021 01:16:43 UTC
The branch stable/12 has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=c494a0c50da9cdbbbb178aee222ec8e21213e545
commit c494a0c50da9cdbbbb178aee222ec8e21213e545
Author: Stephen J. Kiernan <stevek@FreeBSD.org>
AuthorDate: 2020-07-31 16:08:25 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2021-10-08 01:15:59 +0000
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.
(cherry picked from commit fafe230db0cd8d96ac5f3f74643e0c71e949d623)
---
stand/common/install.c | 6 +-----
1 file changed, 1 insertion(+), 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;
}