From 9866fcb9802455914c0e82c1c0f374ec121a7a0c Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Nov 23 2022 18:38:41 +0000 Subject: Remove `failovermethod=priority` These configs are intended to be queried using DNF which never supported this Yum-ism and used to just silently ignored it Signed-off-by: Michel Alexandre Salim --- diff --git a/distros/centos-legacy.conf b/distros/centos-legacy.conf index b913ed2..58b2da4 100644 --- a/distros/centos-legacy.conf +++ b/distros/centos-legacy.conf @@ -15,7 +15,6 @@ mdpolicy=group:primary [centos] name=centos mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever gpgcheck=1 @@ -23,21 +22,18 @@ gpgcheck=1 name=updates enabled=1 mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever gpgcheck=1 [extras] name=extras mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-$releasever gpgcheck=1 [epel] name=epel metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/distros/centos-stream-legacy.conf b/distros/centos-stream-legacy.conf index 5e36354..a3352d6 100644 --- a/distros/centos-stream-legacy.conf +++ b/distros/centos-stream-legacy.conf @@ -14,7 +14,6 @@ mdpolicy=group:primary [Stream-BaseOS] name=CentOS-Stream-$releasever - Base baseurl=http://mirror.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/ -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official gpgcheck=1 skip_if_unavailable=False @@ -50,7 +49,6 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia [epel] name=epel metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 skip_if_unavailable=False diff --git a/distros/centos.conf b/distros/centos.conf index 960a42c..4e5cf3a 100644 --- a/distros/centos.conf +++ b/distros/centos.conf @@ -14,7 +14,6 @@ mdpolicy=group:primary [BaseOS] name=CentOS-$releasever - Base mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=stock -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official gpgcheck=1 skip_if_unavailable=False @@ -51,7 +50,6 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia [epel] name=epel metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 skip_if_unavailable=False diff --git a/distros/fedora.conf b/distros/fedora.conf index 60e9f5f..9b0b607 100644 --- a/distros/fedora.conf +++ b/distros/fedora.conf @@ -15,7 +15,6 @@ mdpolicy=group:primary [fedora] name=Fedora $releasever - $basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary gpgcheck=1 @@ -29,7 +28,6 @@ gpgcheck=1 [updates] name=Fedora $releasever - $basearch - Updates metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary gpgcheck=1 diff --git a/distros/mageia.conf b/distros/mageia.conf index 22269e4..ae22679 100644 --- a/distros/mageia.conf +++ b/distros/mageia.conf @@ -15,13 +15,11 @@ mdpolicy=group:primary [mageia] name=mageia mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch=$distarch§ion=core&repo=release -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia gpgcheck=1 [updates] name=updates mirrorlist=https://www.mageia.org/mirrorlist/?release=$releasever&arch=$distarch§ion=core&repo=updates -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia gpgcheck=1 diff --git a/distros/opensuse-leap-legacy.conf b/distros/opensuse-leap-legacy.conf index c21dc1a..fb47778 100644 --- a/distros/opensuse-leap-legacy.conf +++ b/distros/opensuse-leap-legacy.conf @@ -15,7 +15,6 @@ mdpolicy=group:primary [opensuse-leap-oss] name=opensuse-leap-oss metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/suse/repodata/repomd.xml.metalink -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE gpgcheck=1 repo_gpgcheck=1 @@ -23,7 +22,6 @@ repo_gpgcheck=1 [updates-oss] name=updates-oss metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE gpgcheck=1 repo_gpgcheck=1 diff --git a/distros/opensuse-leap.conf b/distros/opensuse-leap.conf index 7365776..790ddd9 100644 --- a/distros/opensuse-leap.conf +++ b/distros/opensuse-leap.conf @@ -15,7 +15,6 @@ mdpolicy=group:primary [opensuse-leap-oss] name=openSUSE Leap $releasever - OSS metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-15 @@ -25,7 +24,6 @@ repo_gpgcheck=1 [opensuse-leap-oss-update] name=openSUSE Leap $releasever - OSS - Updates metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE gpgcheck=1 repo_gpgcheck=1 diff --git a/distros/opensuse-leap15-legacy.conf b/distros/opensuse-leap15-legacy.conf index d987b9a..31a92cf 100644 --- a/distros/opensuse-leap15-legacy.conf +++ b/distros/opensuse-leap15-legacy.conf @@ -15,7 +15,6 @@ mdpolicy=group:primary [opensuse-leap-oss] name=opensuse-leap-oss metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE gpgcheck=1 repo_gpgcheck=1 @@ -23,7 +22,6 @@ repo_gpgcheck=1 [updates-oss] name=updates-oss metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE gpgcheck=1 repo_gpgcheck=1 diff --git a/distros/opensuse-tumbleweed-snapshot.conf b/distros/opensuse-tumbleweed-snapshot.conf index a102ae1..3cd7b43 100644 --- a/distros/opensuse-tumbleweed-snapshot.conf +++ b/distros/opensuse-tumbleweed-snapshot.conf @@ -15,7 +15,6 @@ mdpolicy=group:primary [opensuse-tumbleweed-oss] name=opensuse-tumbleweed-oss metalink=https://download.opensuse.org/history/$releasever/tumbleweed/repo/oss/repodata/repomd.xml.metalink -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE gpgcheck=1 repo_gpgcheck=1 diff --git a/distros/opensuse-tumbleweed.conf b/distros/opensuse-tumbleweed.conf index 74702f3..0e45ad3 100644 --- a/distros/opensuse-tumbleweed.conf +++ b/distros/opensuse-tumbleweed.conf @@ -15,7 +15,6 @@ mdpolicy=group:primary [opensuse-tumbleweed-oss] name=opensuse-tumbleweed-oss metalink=https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.metalink -failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE gpgcheck=1 repo_gpgcheck=1