bbaassssiiee/fedora-kickstarts
1
0
Fork 0
forked from srbala/fedora-kickstarts
Code Issues Pull Requests Releases Activity

Merge #545 Unify obtaining 'relesever'

Browse Source
This commit is contained in:
Kevin Fenzi 2019-07-20 15:47:56 +00:00
commit f8d32ac4b5
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fedora-cloud-base.ks
View File

@ -215,7 +215,7 @@ truncate -c -s 0 /var/log/dnf.log
truncate -c -s 0 /var/log/dnf.rpm.log truncate -c -s 0 /var/log/dnf.rpm.log
echo "Import RPM GPG key" echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-release) releasever=$(rpm --eval '%{fedora}')
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

2
fedora-cloud-bigdata.ks
View File

@ -182,7 +182,7 @@ dnf clean all
truncate -c -s 0 /var/log/dnf.log truncate -c -s 0 /var/log/dnf.log
echo "Import RPM GPG key" echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-release) releasever=$(rpm --eval '%{fedora}')
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

2
fedora-cloud-experimental.ks
View File

@ -173,7 +173,7 @@ dnf clean all
truncate -c -s 0 /var/log/dnf.log truncate -c -s 0 /var/log/dnf.log
echo "Import RPM GPG key" echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-release) releasever=$(rpm --eval '%{fedora}')
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

2
fedora-container-common.ks
View File

@ -66,7 +66,7 @@ echo 'LANG="C.UTF-8"' > /etc/locale.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1400682 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
echo "Import RPM GPG key" echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-release-container) releasever=$(rpm --eval '%{fedora}')
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "# fstab intentionally empty for containers" > /etc/fstab echo "# fstab intentionally empty for containers" > /etc/fstab

2
fedora-disk-base.ks
View File

@ -62,7 +62,7 @@ glibc-all-langpacks
# Setup Raspberry Pi firmware # Setup Raspberry Pi firmware
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
releasever=$(rpm -q --qf '%{version}\n' fedora-release) releasever=$(rpm --eval '%{fedora}')
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "Packages within this disk image" echo "Packages within this disk image"
rpm -qa rpm -qa

2
fedora-live-base.ks
View File

@ -304,7 +304,7 @@ EOF
# 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' --whatprovides system-release) releasever=$(rpm --eval '%{fedora}')
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"

2
fedora-modular-disk-minimal.ks
View File

@ -58,7 +58,7 @@ dhcp-client
# Setup Raspberry Pi firmware # Setup Raspberry Pi firmware
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release) releasever=$(rpm --eval '%{fedora}')
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "Packages within this disk image" echo "Packages within this disk image"
rpm -qa rpm -qa