mirror of
https://pagure.io/fedora-kickstarts.git
synced 2024-11-22 15:33:07 +00:00
Merge #545 Unify obtaining 'relesever'
This commit is contained in:
commit
f8d32ac4b5
@ -215,7 +215,7 @@ truncate -c -s 0 /var/log/dnf.log
|
||||
truncate -c -s 0 /var/log/dnf.rpm.log
|
||||
|
||||
echo "Import RPM GPG key"
|
||||
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
||||
releasever=$(rpm --eval '%{fedora}')
|
||||
basearch=$(uname -i)
|
||||
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
|
||||
|
||||
|
@ -182,7 +182,7 @@ dnf clean all
|
||||
truncate -c -s 0 /var/log/dnf.log
|
||||
|
||||
echo "Import RPM GPG key"
|
||||
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
||||
releasever=$(rpm --eval '%{fedora}')
|
||||
basearch=$(uname -i)
|
||||
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
|
||||
|
||||
|
@ -173,7 +173,7 @@ dnf clean all
|
||||
truncate -c -s 0 /var/log/dnf.log
|
||||
|
||||
echo "Import RPM GPG key"
|
||||
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
||||
releasever=$(rpm --eval '%{fedora}')
|
||||
basearch=$(uname -i)
|
||||
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
|
||||
|
||||
|
@ -66,7 +66,7 @@ echo 'LANG="C.UTF-8"' > /etc/locale.conf
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
|
||||
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
|
||||
|
||||
echo "# fstab intentionally empty for containers" > /etc/fstab
|
||||
|
@ -62,7 +62,7 @@ glibc-all-langpacks
|
||||
# Setup Raspberry Pi firmware
|
||||
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
|
||||
echo "Packages within this disk image"
|
||||
rpm -qa
|
||||
|
@ -304,7 +304,7 @@ EOF
|
||||
|
||||
# work around for poor key import UI in PackageKit
|
||||
rm -f /var/lib/rpm/__db*
|
||||
releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
|
||||
releasever=$(rpm --eval '%{fedora}')
|
||||
basearch=$(uname -i)
|
||||
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
|
||||
echo "Packages within this LiveCD"
|
||||
|
@ -58,7 +58,7 @@ dhcp-client
|
||||
# Setup Raspberry Pi firmware
|
||||
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
|
||||
echo "Packages within this disk image"
|
||||
rpm -qa
|
||||
|
Loading…
Reference in New Issue
Block a user