Module Name: src
Committed By: bouyer
Date: Sun Mar 24 20:26:14 UTC 2024
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: configmenu.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #644):
usr.sbin/sysinst/configmenu.c: revision 1.19
PR 58062: fix a bug I introduced with the https support: update
the pkgsrc/binary pkgs download URL not only when https transport
is selected.
To generate a diff of this commit:
cvs rdiff -u -r1.17.2.1 -r1.17.2.2 src/usr.sbin/sysinst/configmenu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/configmenu.c
diff -u src/usr.sbin/sysinst/configmenu.c:1.17.2.1 src/usr.sbin/sysinst/configmenu.c:1.17.2.2
--- src/usr.sbin/sysinst/configmenu.c:1.17.2.1 Tue Dec 26 05:54:15 2023
+++ src/usr.sbin/sysinst/configmenu.c Sun Mar 24 20:26:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.17.2.1 2023/12/26 05:54:15 snj Exp $ */
+/* $NetBSD: configmenu.c,v 1.17.2.2 2024/03/24 20:26:14 bouyer Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -340,12 +340,11 @@ set_binpkg(struct menudesc *menu, void *
* Make sure we have the TLS certs in a usable state
* (if target is a new installation)
*/
- if (pkg.xfer == XFER_HTTPS) {
+ if (pkg.xfer == XFER_HTTPS)
run_program(RUN_CHROOT | RUN_SILENT,
"/bin/sh /etc/rc.d/certctl_init onestart");
- make_url(pkgpath, &pkg, pkg_dir);
- }
+ make_url(pkgpath, &pkg, pkg_dir);
if (run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
"pkg_add %s/pkgin", pkgpath) == 0) {
allok = 1;
