diff --git a/builder/templates/fedora-33.index-fragment b/builder/templates/fedora-33.index-fragment index 438a79c7c..44e456f76 100644 --- a/builder/templates/fedora-33.index-fragment +++ b/builder/templates/fedora-33.index-fragment @@ -3,10 +3,11 @@ name=Fedora® 33 Server osinfo=fedora33 arch=x86_64 file=fedora-33.xz -checksum[sha512]=7ef3a333456ee4deda38c369616a4423652029837f7aa09862940327608d285c79e1c7ed90c3bb4814878dbdce3fa1f11a8625439739743bce73947fc80c08eb +revision=2 +checksum[sha512]=f80a018b494d5f2e44873094855f03a1f15080ee46f88d825bfe1de55b5903f5d9d822de18122ecac00d6295b2a8e7461950befef4c494ebcfe6b1f5e3aa5cc3 format=raw size=6442450944 -compressed_size=501145952 +compressed_size=392812568 expand=/dev/sda3 notes=Fedora® 33 Server diff --git a/builder/templates/fedora-33.ks b/builder/templates/fedora-33.ks index b1de85a75..ed2d3c5f2 100644 --- a/builder/templates/fedora-33.ks +++ b/builder/templates/fedora-33.ks @@ -28,7 +28,7 @@ poweroff %post # Ensure the installation is up-to-date. -dnf -y --best upgrade +#dnf -y --best upgrade # Enable Xen domU support. pushd /etc/dracut.conf.d echo 'add_drivers+=" xen:vbd xen:vif "' > virt-builder-xen-drivers.conf diff --git a/builder/templates/fedora-33.virt-install-cmd b/builder/templates/fedora-33.virt-install-cmd index 0b1cc3876..52138160f 100644 --- a/builder/templates/fedora-33.virt-install-cmd +++ b/builder/templates/fedora-33.virt-install-cmd @@ -5,7 +5,7 @@ 'virt-install' \ '--transient' \ - '--name=tmp-hosoapgs' \ + '--name=tmp-vxsw7p2j' \ '--ram=4096' \ '--arch=x86_64' \ '--cpu=host' \ @@ -13,7 +13,7 @@ '--os-variant=fedora26' \ '--initrd-inject=fedora-33.ks' \ '--extra-args=ks=file:/fedora-33.ks console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH' \ - '--disk=/home/rjones/d/libguestfs/builder/templates/tmp-hosoapgs.img,size=6,format=raw' \ + '--disk=/home/rjones/d/libguestfs/builder/templates/tmp-vxsw7p2j.img,size=6,format=raw' \ '--location=http://mirror.bytemark.co.uk/fedora/linux/releases/33/Server/x86_64/os/' \ '--serial=pty' \ '--nographics' diff --git a/builder/templates/make-template.ml b/builder/templates/make-template.ml index 44a378f3a..4fd0a35a9 100755 --- a/builder/templates/make-template.ml +++ b/builder/templates/make-template.ml @@ -622,7 +622,9 @@ dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION bpf "%%post\n"; bpf "\ # Ensure the installation is up-to-date. -dnf -y --best upgrade +# This makes Fedora >= 33 unbootable, see: +# https://bugzilla.redhat.com/show_bug.cgi?id=1911177 +#dnf -y --best upgrade "; let needs_regenerate_dracut = ref false in diff --git a/website/download/builder/index b/website/download/builder/index index e07d503d5..701c96829 100644 --- a/website/download/builder/index +++ b/website/download/builder/index @@ -1627,10 +1627,11 @@ name=Fedora® 33 Server osinfo=fedora33 arch=x86_64 file=fedora-33.xz -checksum[sha512]=7ef3a333456ee4deda38c369616a4423652029837f7aa09862940327608d285c79e1c7ed90c3bb4814878dbdce3fa1f11a8625439739743bce73947fc80c08eb +revision=2 +checksum[sha512]=f80a018b494d5f2e44873094855f03a1f15080ee46f88d825bfe1de55b5903f5d9d822de18122ecac00d6295b2a8e7461950befef4c494ebcfe6b1f5e3aa5cc3 format=raw size=6442450944 -compressed_size=501145952 +compressed_size=392812568 expand=/dev/sda3 notes=Fedora® 33 Server