From 7b5299868c1c3f50ec33b32b69fa4a8183d8f95a Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 24 Mar 2022 14:23:17 +0100
Subject: Update of CA certificates should happen before running slackpkg

---
 make_slackware_live.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 1b97c77..4593c79 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -2032,6 +2032,10 @@ EOT
 echo "-- Creating slackpkg cache, takes a few seconds..."
 chroot "${LIVE_ROOTDIR}" /bin/bash <<EOSL 2>${DBGOUT}
 
+# Rebuild SSL certificate database to prevent GPG verification errors
+# which are in fact triggered by SSL certificate errors:
+/usr/sbin/update-ca-certificates --fresh 1>/dev/null
+
 if [ -f var/log/packages/slackpkg+-* ] ; then
   cat <<EOPL > etc/slackpkg/slackpkgplus.conf
 SLACKPKGPLUS=on
@@ -3094,10 +3098,8 @@ sed -i -e '/systohc/s/^/# /' ${LIVE_ROOTDIR}/etc/rc.d/rc.6
 
 # Run some package setup scripts (usually run by the slackware installer),
 # as well as some of the delaying commands in rc.M and rc.modules:
-chroot ${LIVE_ROOTDIR} /bin/bash <<EOCR
-# Rebuild SSL certificate database:
-/usr/sbin/update-ca-certificates --fresh 1>/dev/null 2>${DBGOUT}
 
+chroot ${LIVE_ROOTDIR} /bin/bash <<EOCR
 # Run bits from rc.M so we won't need to run them again in the live system:
 /sbin/depmod $KVER
 /sbin/ldconfig
-- 
cgit v1.2.3