From cef2d61789d3d9cf2306af628d2fd60cf648ac03 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Thu, 16 Nov 2023 11:08:38 -0700 Subject: [PATCH] ensure the right key is used --- live/9/aarch64/peridot/rocky-live-base-spin.ks | 2 +- live/9/aarch64/peridot/rocky-live-base.ks | 2 +- live/9/aarch64/prod/rocky-live-base-spin.ks | 2 +- live/9/aarch64/prod/rocky-live-base.ks | 2 +- live/9/aarch64/stage/rocky-live-base-spin.ks | 2 +- live/9/aarch64/stage/rocky-live-base.ks | 2 +- live/9/ppc64le/peridot/rocky-live-base-spin.ks | 2 +- live/9/ppc64le/peridot/rocky-live-base.ks | 2 +- live/9/ppc64le/prod/rocky-live-base-spin.ks | 2 +- live/9/ppc64le/prod/rocky-live-base.ks | 2 +- live/9/ppc64le/stage/rocky-live-base-spin.ks | 2 +- live/9/ppc64le/stage/rocky-live-base.ks | 2 +- live/9/x86_64/peridot/mainline/rocky-live-base.ks | 2 +- live/9/x86_64/peridot/rocky-live-base-spin.ks | 2 +- live/9/x86_64/peridot/rocky-live-base.ks | 2 +- live/9/x86_64/prod/mainline/rocky-live-base.ks | 2 +- live/9/x86_64/prod/rocky-live-base-spin.ks | 2 +- live/9/x86_64/prod/rocky-live-base.ks | 2 +- live/9/x86_64/stage/mainline/rocky-live-base.ks | 2 +- live/9/x86_64/stage/rocky-live-base-spin.ks | 2 +- live/9/x86_64/stage/rocky-live-base.ks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/live/9/aarch64/peridot/rocky-live-base-spin.ks b/live/9/aarch64/peridot/rocky-live-base-spin.ks index 00d56ca..445254e 100644 --- a/live/9/aarch64/peridot/rocky-live-base-spin.ks +++ b/live/9/aarch64/peridot/rocky-live-base-spin.ks @@ -313,7 +313,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/aarch64/peridot/rocky-live-base.ks b/live/9/aarch64/peridot/rocky-live-base.ks index 8af4936..e50e9ac 100644 --- a/live/9/aarch64/peridot/rocky-live-base.ks +++ b/live/9/aarch64/peridot/rocky-live-base.ks @@ -309,7 +309,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/aarch64/prod/rocky-live-base-spin.ks b/live/9/aarch64/prod/rocky-live-base-spin.ks index 00d56ca..445254e 100644 --- a/live/9/aarch64/prod/rocky-live-base-spin.ks +++ b/live/9/aarch64/prod/rocky-live-base-spin.ks @@ -313,7 +313,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/aarch64/prod/rocky-live-base.ks b/live/9/aarch64/prod/rocky-live-base.ks index 8af4936..e50e9ac 100644 --- a/live/9/aarch64/prod/rocky-live-base.ks +++ b/live/9/aarch64/prod/rocky-live-base.ks @@ -309,7 +309,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/aarch64/stage/rocky-live-base-spin.ks b/live/9/aarch64/stage/rocky-live-base-spin.ks index 00d56ca..445254e 100644 --- a/live/9/aarch64/stage/rocky-live-base-spin.ks +++ b/live/9/aarch64/stage/rocky-live-base-spin.ks @@ -313,7 +313,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/aarch64/stage/rocky-live-base.ks b/live/9/aarch64/stage/rocky-live-base.ks index 8af4936..e50e9ac 100644 --- a/live/9/aarch64/stage/rocky-live-base.ks +++ b/live/9/aarch64/stage/rocky-live-base.ks @@ -309,7 +309,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/ppc64le/peridot/rocky-live-base-spin.ks b/live/9/ppc64le/peridot/rocky-live-base-spin.ks index 0f2461e..68b0622 100644 --- a/live/9/ppc64le/peridot/rocky-live-base-spin.ks +++ b/live/9/ppc64le/peridot/rocky-live-base-spin.ks @@ -315,7 +315,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/ppc64le/peridot/rocky-live-base.ks b/live/9/ppc64le/peridot/rocky-live-base.ks index f56fa17..b0b2925 100644 --- a/live/9/ppc64le/peridot/rocky-live-base.ks +++ b/live/9/ppc64le/peridot/rocky-live-base.ks @@ -311,7 +311,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/ppc64le/prod/rocky-live-base-spin.ks b/live/9/ppc64le/prod/rocky-live-base-spin.ks index 0f2461e..68b0622 100644 --- a/live/9/ppc64le/prod/rocky-live-base-spin.ks +++ b/live/9/ppc64le/prod/rocky-live-base-spin.ks @@ -315,7 +315,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/ppc64le/prod/rocky-live-base.ks b/live/9/ppc64le/prod/rocky-live-base.ks index f56fa17..b0b2925 100644 --- a/live/9/ppc64le/prod/rocky-live-base.ks +++ b/live/9/ppc64le/prod/rocky-live-base.ks @@ -311,7 +311,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/ppc64le/stage/rocky-live-base-spin.ks b/live/9/ppc64le/stage/rocky-live-base-spin.ks index 0f2461e..68b0622 100644 --- a/live/9/ppc64le/stage/rocky-live-base-spin.ks +++ b/live/9/ppc64le/stage/rocky-live-base-spin.ks @@ -315,7 +315,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/ppc64le/stage/rocky-live-base.ks b/live/9/ppc64le/stage/rocky-live-base.ks index f56fa17..b0b2925 100644 --- a/live/9/ppc64le/stage/rocky-live-base.ks +++ b/live/9/ppc64le/stage/rocky-live-base.ks @@ -311,7 +311,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/peridot/mainline/rocky-live-base.ks b/live/9/x86_64/peridot/mainline/rocky-live-base.ks index 0770eb5..01a2c24 100644 --- a/live/9/x86_64/peridot/mainline/rocky-live-base.ks +++ b/live/9/x86_64/peridot/mainline/rocky-live-base.ks @@ -296,7 +296,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/peridot/rocky-live-base-spin.ks b/live/9/x86_64/peridot/rocky-live-base-spin.ks index 3f0d7b1..6bc0360 100644 --- a/live/9/x86_64/peridot/rocky-live-base-spin.ks +++ b/live/9/x86_64/peridot/rocky-live-base-spin.ks @@ -313,7 +313,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/peridot/rocky-live-base.ks b/live/9/x86_64/peridot/rocky-live-base.ks index 7a2775e..c7a5805 100644 --- a/live/9/x86_64/peridot/rocky-live-base.ks +++ b/live/9/x86_64/peridot/rocky-live-base.ks @@ -309,7 +309,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/prod/mainline/rocky-live-base.ks b/live/9/x86_64/prod/mainline/rocky-live-base.ks index 2ca2b52..c1539eb 100644 --- a/live/9/x86_64/prod/mainline/rocky-live-base.ks +++ b/live/9/x86_64/prod/mainline/rocky-live-base.ks @@ -297,7 +297,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/prod/rocky-live-base-spin.ks b/live/9/x86_64/prod/rocky-live-base-spin.ks index 3f0d7b1..6bc0360 100644 --- a/live/9/x86_64/prod/rocky-live-base-spin.ks +++ b/live/9/x86_64/prod/rocky-live-base-spin.ks @@ -313,7 +313,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/prod/rocky-live-base.ks b/live/9/x86_64/prod/rocky-live-base.ks index 7a2775e..c7a5805 100644 --- a/live/9/x86_64/prod/rocky-live-base.ks +++ b/live/9/x86_64/prod/rocky-live-base.ks @@ -309,7 +309,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/stage/mainline/rocky-live-base.ks b/live/9/x86_64/stage/mainline/rocky-live-base.ks index 0770eb5..01a2c24 100644 --- a/live/9/x86_64/stage/mainline/rocky-live-base.ks +++ b/live/9/x86_64/stage/mainline/rocky-live-base.ks @@ -296,7 +296,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/stage/rocky-live-base-spin.ks b/live/9/x86_64/stage/rocky-live-base-spin.ks index 3f0d7b1..6bc0360 100644 --- a/live/9/x86_64/stage/rocky-live-base-spin.ks +++ b/live/9/x86_64/stage/rocky-live-base-spin.ks @@ -313,7 +313,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/live/9/x86_64/stage/rocky-live-base.ks b/live/9/x86_64/stage/rocky-live-base.ks index 7a2775e..c7a5805 100644 --- a/live/9/x86_64/stage/rocky-live-base.ks +++ b/live/9/x86_64/stage/rocky-live-base.ks @@ -309,7 +309,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted