mirror of
https://github.com/coreos/fedora-coreos-config.git
synced 2026-11-03 14:49:47 -09:00
tree: move repo files to use GPG keys in /etc/pki/rpm-gpg
The use of distribution-gpg-keys for these repo files is
ancient; the first occurrence is 342e8813 ("Switch to f29, add
fedora-release-coreos") which doesn't have a rationale for it.
However, in practice today FCOS is currently built only by Fedora-based
tools, like cosa and the bootc-base-imagectl in fedora-bootc. So we
could just use the `/etc/pki/rpm-gpg` paths there.
This allows us to avoid having to install `distribution-gpg-keys` before
doing a compose. Note that `fedora-rawhide.repo` was already using the
`/etc` path so we know this works.
This commit is contained in:
parent
a4930a0455
commit
7e0b77008d
4 changed files with 9 additions and 9 deletions
|
|
@ -20,7 +20,7 @@ enabled=1
|
|||
repo_gpgcheck=0
|
||||
type=rpm
|
||||
gpgcheck=1
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
||||
[fedora-archive-updates]
|
||||
|
|
@ -35,5 +35,5 @@ enabled=1
|
|||
repo_gpgcheck=0
|
||||
type=rpm
|
||||
gpgcheck=1
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@ enabled=1
|
|||
repo_gpgcheck=0
|
||||
type=rpm
|
||||
gpgcheck=1
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ enabled=1
|
|||
repo_gpgcheck=0
|
||||
type=rpm
|
||||
gpgcheck=1
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
||||
[fedora-next-updates]
|
||||
|
|
@ -24,7 +24,7 @@ repo_gpgcheck=0
|
|||
type=rpm
|
||||
gpgcheck=1
|
||||
metadata_expire=6h
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
||||
[fedora-next-updates-testing]
|
||||
|
|
@ -35,5 +35,5 @@ baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releaseve
|
|||
enabled=1
|
||||
gpgcheck=1
|
||||
metadata_expire=6h
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ enabled=1
|
|||
repo_gpgcheck=0
|
||||
type=rpm
|
||||
gpgcheck=1
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
||||
[fedora-updates]
|
||||
|
|
@ -24,7 +24,7 @@ repo_gpgcheck=0
|
|||
type=rpm
|
||||
gpgcheck=1
|
||||
metadata_expire=6h
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
||||
[fedora-updates-testing]
|
||||
|
|
@ -35,5 +35,5 @@ baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releaseve
|
|||
enabled=1
|
||||
gpgcheck=1
|
||||
metadata_expire=6h
|
||||
gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
|
||||
skip_if_unavailable=False
|
||||
|
|
|
|||
Loading…
Reference in a new issue