mirror of
https://pagure.io/fedora-kickstarts.git
synced 2024-11-29 10:23:08 +00:00
fedora-live-base.ks: do not hardcode fedora-release in %post
Do not hardcode the fedora-release package name in the %post scriptlet (in the place that imports the Fedora RPM GPG key). Instead, use "--whatprovides system-release", which is strictly equivalent if fedora-release is used, but also works when the *-release package is named differently. This makes live easier for remixes, which have to replace fedora-release with generic-release or ${remixname}-release. They would otherwise have to edit fedora-live-base.ks.
This commit is contained in:
parent
854d60c781
commit
ccd8c30b88
@ -280,7 +280,7 @@ systemctl enable tmp.mount
|
|||||||
|
|
||||||
# work around for poor key import UI in PackageKit
|
# work around for poor key import UI in PackageKit
|
||||||
rm -f /var/lib/rpm/__db*
|
rm -f /var/lib/rpm/__db*
|
||||||
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
|
||||||
basearch=$(uname -i)
|
basearch=$(uname -i)
|
||||||
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
|
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
|
||||||
echo "Packages within this LiveCD"
|
echo "Packages within this LiveCD"
|
||||||
|
Loading…
Reference in New Issue
Block a user