set releasever and basearch so we can find the right RPM GPG key to import

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)
2025-12-10 17:10:31 +08:00 · 2013-12-11 11:57:41 -07:00 · 2013-12-11 10:36:26 -08:00
2 changed files with 3 additions and 1 deletions
--- 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
--- 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 -m)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
Author	SHA1	Message	Date
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