From 352a416c61c7dd5a171d3dc8c8e7d882d8ad2d3a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Dec 2013 04:12:29 -0600 Subject: [PATCH] use uname -i as it gives the arch used as the basearch by yum uname -m is incorrect --- fedora-cloud-base.ks | 2 +- fedora-live-base.ks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 756b097..980328b 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -197,7 +197,7 @@ truncate -c -s 0 /var/log/yum.log echo "Import RPM GPG key" releasever=$(rpm -q --qf '%{version}\n' fedora-release) -basearch=$(uname -m) +basearch=$(uname -i) rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch echo "Packages within this cloud image:" diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 1808117..29be3c2 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -281,7 +281,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) -basearch=$(uname -m) +basearch=$(uname -i) rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch echo "Packages within this LiveCD" rpm -qa