import the gpg key since live and cloud is

use uname -i as it gives the arch used as the basearch by yum uname -m is incorrect
correct path when copying GPL to live root (unversioned docdirs)
2025-12-11 01:20:30 +08:00 · 2013-12-21 15:40:44 -06:00 · 2013-12-21 15:40:44 -06:00 · 2013-12-21 15:40:44 -06:00 · 2013-12-11 11:57:41 -07:00 · 2013-12-11 10:36:26 -08:00
3 changed files with 15 additions and 3 deletions
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -48,6 +48,16 @@ uboot-wandboard_quad

 %post

+# work around for poor key import UI in PackageKit
+rm -f /var/lib/rpm/__db*
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=armhfp
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+echo "Packages within this LiveCD"
+rpm -qa
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -21,7 +21,7 @@ rootpw --lock --iscrypted locked

 firewall --disabled

-bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8" extlinux

 network --bootproto=dhcp --device=eth0 --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -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:"
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -280,6 +280,8 @@ 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 -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
@@ -301,7 +303,7 @@ rm -f /core*


 %post --nochroot
-cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
+cp $INSTALL_ROOT/usr/share/doc/*-release/GPL $LIVE_ROOT/GPL

 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
Author	SHA1	Message	Date
Dennis Gilmore	9bfe625d34	import the gpg key since live and cloud is	2013-12-21 15:40:44 -06:00
Dennis Gilmore	de56fb5bf2	use uname -i as it gives the arch used as the basearch by yum uname -m is incorrect	2013-12-21 15:40:44 -06:00
Adam Williamson	4d772b386c	correct path when copying GPL to live root (unversioned docdirs)	2013-12-21 15:40:44 -06:00
Matthew Miller	ce61f186bb	set releasever and basearch so we can find the right RPM GPG key to import	2013-12-11 11:57:41 -07:00
Matthew Miller	5579ccc249	switch order of serial and virtual console so logs output to serial console because that's more useful in openstack. Note does not affect pvgrub (and therefore ec2)	2013-12-11 10:36:26 -08:00