From 37338f2967e47877f21a3d1225a6a85e3451b851 Mon Sep 17 00:00:00 2001 From: Masanori Ogino Date: Fri, 1 Sep 2023 17:20:50 +0900 Subject: [PATCH] images/netbsd: Update 9.x to 9.3 Signed-off-by: Masanori Ogino --- images/netbsd/8.x/genimg | 2 +- images/netbsd/9.x/genimg | 4 ++-- images/netbsd/genimg | 13 +++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/images/netbsd/8.x/genimg b/images/netbsd/8.x/genimg index 04df38c..9b4f4ec 100755 --- a/images/netbsd/8.x/genimg +++ b/images/netbsd/8.x/genimg @@ -2,5 +2,5 @@ arch="${1:-amd64}" export netbsd_dist="https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.2/$arch" export netbsd_suffix="tgz" -export pkgin_dist="http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$arch/8.2/All" +export pkgin_dist="cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$arch/8.2/All" exec ../genimg "$@" diff --git a/images/netbsd/9.x/genimg b/images/netbsd/9.x/genimg index ac200f7..ab27ed8 100755 --- a/images/netbsd/9.x/genimg +++ b/images/netbsd/9.x/genimg @@ -1,6 +1,6 @@ #!/bin/sh -eu arch="${1:-amd64}" -export netbsd_dist="https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.2/$arch" +export netbsd_dist="https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.3/$arch" export netbsd_suffix="tar.xz" -export pkgin_dist="https://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$arch/9.2/All" +export pkgin_dist="cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$arch/9.3/All" exec ../genimg "$@" diff --git a/images/netbsd/genimg b/images/netbsd/genimg index fac07e0..0b45892 100755 --- a/images/netbsd/genimg +++ b/images/netbsd/genimg @@ -113,14 +113,19 @@ EOF sed -e 's/^rc_configured=NO/rc_configured=YES/' \ -i /mnt/etc/rc.conf -run_root pkg_add "$pkgin_dist/pkgin" -echo "$pkgin_dist" > /mnt/usr/pkg/etc/pkgin/repositories.conf +# NB: Use HTTP to obtain latest root certificates to prevent connection +# errors. +run_root PKG_PATH="http://$pkgin_dist" pkg_add "pkgin" +echo "http://$pkgin_dist" > /mnt/usr/pkg/etc/pkgin/repositories.conf run_root pkgin -y update +run_root pkgin -y install mozilla-rootcerts +run_root mozilla-rootcerts install +# Now we can rely on HTTPS +echo "https://$pkgin_dist" > /mnt/usr/pkg/etc/pkgin/repositories.conf # TODO: Remove bash run_root pkgin -y install sudo gnupg git-base mercurial \ - moreutils mozilla-rootcerts bash + moreutils bash run_root pkgin clean -run_root mozilla-rootcerts install cat </mnt/etc/login.conf default:\ -- 2.38.5