From 9775777a55278549f8c6543c5685bf402a728abe Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Thu, 17 Mar 2016 10:39:11 +0100 Subject: [PATCH] builder: fedora: ensure images are up-to-date Update the system at the end of the installation, so the generated image is up-to-date. This also removes the need to manually update dnf on i686 and x86_64. --- builder/website/fedora-aarch64.sh | 3 +++ builder/website/fedora-armv7l.sh | 3 +++ builder/website/fedora-i686.sh | 9 +++------ builder/website/fedora-ppc64.sh | 3 +++ builder/website/fedora-ppc64le.sh | 3 +++ builder/website/fedora.sh | 9 +++------ 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/builder/website/fedora-aarch64.sh b/builder/website/fedora-aarch64.sh index 999c5eb28..8c7c1b90a 100755 --- a/builder/website/fedora-aarch64.sh +++ b/builder/website/fedora-aarch64.sh @@ -64,6 +64,9 @@ poweroff # Rerun dracut for the installed kernel (not the running kernel): KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n') dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + +# Ensure the installation is up-to-date: +dnf -y --best upgrade %end EOF diff --git a/builder/website/fedora-armv7l.sh b/builder/website/fedora-armv7l.sh index d173e8a78..1de9b93aa 100755 --- a/builder/website/fedora-armv7l.sh +++ b/builder/website/fedora-armv7l.sh @@ -64,6 +64,9 @@ poweroff # Rerun dracut for the installed kernel (not the running kernel): KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n') dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + +# Ensure the installation is up-to-date: +dnf -y --best upgrade %end EOF diff --git a/builder/website/fedora-i686.sh b/builder/website/fedora-i686.sh index 3016512d1..ccae8ab50 100755 --- a/builder/website/fedora-i686.sh +++ b/builder/website/fedora-i686.sh @@ -73,6 +73,9 @@ popd # Rerun dracut for the installed kernel (not the running kernel): KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n') dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + +# Ensure the installation is up-to-date: +dnf -y --best upgrade %end EOF @@ -97,10 +100,4 @@ virt-install \ --nographics \ --noreboot -# https://bugzilla.redhat.com/show_bug.cgi?id=1280029 -# (Only for Fedora 23) -if [ "$version" = "23" ]; then - virt-customize -a $output --install "https://kojipkgs.fedoraproject.org//packages/dnf/1.1.4/2.fc23/noarch/dnf-1.1.4-2.fc23.noarch.rpm,https://kojipkgs.fedoraproject.org//packages/dnf/1.1.4/2.fc23/noarch/dnf-conf-1.1.4-2.fc23.noarch.rpm,https://kojipkgs.fedoraproject.org//packages/dnf/1.1.4/2.fc23/noarch/dnf-yum-1.1.4-2.fc23.noarch.rpm,https://kojipkgs.fedoraproject.org//packages/dnf/1.1.4/2.fc23/noarch/python3-dnf-1.1.4-2.fc23.noarch.rpm" -fi - source $(dirname "$0")/compress.sh $output diff --git a/builder/website/fedora-ppc64.sh b/builder/website/fedora-ppc64.sh index 7c4b463d0..b664e0484 100755 --- a/builder/website/fedora-ppc64.sh +++ b/builder/website/fedora-ppc64.sh @@ -64,6 +64,9 @@ poweroff # Rerun dracut for the installed kernel (not the running kernel): KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n') dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + +# Ensure the installation is up-to-date: +dnf -y --best upgrade %end EOF diff --git a/builder/website/fedora-ppc64le.sh b/builder/website/fedora-ppc64le.sh index 649d6202c..351b5698f 100755 --- a/builder/website/fedora-ppc64le.sh +++ b/builder/website/fedora-ppc64le.sh @@ -64,6 +64,9 @@ poweroff # Rerun dracut for the installed kernel (not the running kernel): KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n') dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + +# Ensure the installation is up-to-date: +dnf -y --best upgrade %end EOF diff --git a/builder/website/fedora.sh b/builder/website/fedora.sh index a6d497095..8e48ce1b8 100755 --- a/builder/website/fedora.sh +++ b/builder/website/fedora.sh @@ -73,6 +73,9 @@ popd # Rerun dracut for the installed kernel (not the running kernel): KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n') dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + +# Ensure the installation is up-to-date: +dnf -y --best upgrade %end EOF @@ -97,10 +100,4 @@ virt-install \ --nographics \ --noreboot -# https://bugzilla.redhat.com/show_bug.cgi?id=1280029 -# (Only for Fedora 23) -if [ "$version" = "23" ]; then - virt-customize -a $output --install "https://kojipkgs.fedoraproject.org//packages/dnf/1.1.4/2.fc23/noarch/dnf-1.1.4-2.fc23.noarch.rpm,https://kojipkgs.fedoraproject.org//packages/dnf/1.1.4/2.fc23/noarch/dnf-conf-1.1.4-2.fc23.noarch.rpm,https://kojipkgs.fedoraproject.org//packages/dnf/1.1.4/2.fc23/noarch/dnf-yum-1.1.4-2.fc23.noarch.rpm,https://kojipkgs.fedoraproject.org//packages/dnf/1.1.4/2.fc23/noarch/python3-dnf-1.1.4-2.fc23.noarch.rpm" -fi - source $(dirname "$0")/compress.sh $output