[Fedora-spins] [spin-kickstarts] fedora-live-base.ks: do not hardcode fedora-release in %post

Kevin Kofler kkofler at fedoraproject.org
Mon Apr 7 12:05:24 UTC 2014


commit ccd8c30b8864d21099aaa66f56b491c66d23797c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Apr 7 14:04:57 2014 +0200

    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.

 fedora-live-base.ks |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 29be3c2..3e29713 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -280,7 +280,7 @@ systemctl enable tmp.mount
 
 # work around for poor key import UI in PackageKit
 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)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"


More information about the spins mailing list