Date: Fri, 31 Jul 2020 16:08:25 +0000 (UTC) From: "Stephen J. Kiernan" <stevek@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363738 - head/stand/common Message-ID: <202007311608.06VG8Prr005958@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stevek Date: Fri Jul 31 16:08:25 2020 New Revision: 363738 URL: https://svnweb.freebsd.org/changeset/base/363738 Log: 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 Modified: head/stand/common/install.c Modified: head/stand/common/install.c ============================================================================== --- head/stand/common/install.c Fri Jul 31 14:13:26 2020 (r363737) +++ head/stand/common/install.c Fri Jul 31 16:08:25 2020 (r363738) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007311608.06VG8Prr005958>