From 65f5bfb99699328e5bfc5d3d28399f27512aac7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Mon, 16 Dec 2019 14:51:14 +0100
Subject: [PATCH 1/4] Do not enable unused systemd-networkd on Fedora image

---
 fedora-build-opennebula-image.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh
index 3dddae1..219ad6e 100755
--- a/fedora-build-opennebula-image.sh
+++ b/fedora-build-opennebula-image.sh
@@ -130,7 +130,6 @@ run_root dnf -y install e2fsprogs
 
 # Initalize base services.
 run_root systemd-machine-id-setup
-run_root systemctl enable systemd-networkd.service
 
 run_root ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 run_root systemctl enable systemd-timesyncd.service

From d11620a9fb7a1550df37d221711413cd2960704b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Tue, 17 Dec 2019 10:18:40 +0100
Subject: [PATCH 2/4] Fedora image: be sure to use right kernel version when
 generating initramfs

---
 fedora-build-opennebula-image.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh
index 219ad6e..837ba6f 100755
--- a/fedora-build-opennebula-image.sh
+++ b/fedora-build-opennebula-image.sh
@@ -143,7 +143,8 @@ run_root dnf -y install kernel grub2
 cat > /mnt/etc/dracut.conf.d/virtio-blk.conf <<EOF
 add_drivers="virtio-blk"
 EOF
-run_root dracut --force
+kernel_version=$(ls /mnt/boot | grep "vmlinuz.*.$ARCH" | cut -d- -f2-)
+run_root dracut --force --kver $kernel_version
 
 # Configure grub2.
 run_root grub2-install --target=i386-pc "${NBD_DEVICE}"

From 746c116700a79a750b9201ae18f1cbe570ffebfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Tue, 17 Dec 2019 11:21:54 +0100
Subject: [PATCH 3/4] Remove now irrelevant comment from Fedora image
 definition

---
 fedora-build-opennebula-image.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh
index 837ba6f..5197acc 100755
--- a/fedora-build-opennebula-image.sh
+++ b/fedora-build-opennebula-image.sh
@@ -83,8 +83,6 @@ mount "${NBD_DEVICE}p2" /mnt
 mkdir /mnt/boot
 mount "${NBD_DEVICE}p1" /mnt/boot
 
-# XXX: dnf has a lot a weird (libX11?) dependencies, use microdnf instead?
-
 dnf -y \
 	--releasever=$RELEASE \
 	--installroot=/mnt \

From 5e438aafe83a10444fc68f35b4074748df4905c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Tue, 17 Dec 2019 13:56:05 +0100
Subject: [PATCH 4/4] Fedora image: increase /boot from 100M to 500M

---
 fedora-build-opennebula-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh
index 5197acc..45c1629 100755
--- a/fedora-build-opennebula-image.sh
+++ b/fedora-build-opennebula-image.sh
@@ -68,7 +68,7 @@ trap cleanup EXIT
 
 # Create partition table, format partitions.
 sfdisk --no-reread "$NBD_DEVICE" <<EOF
-1M,100M,L,*
+1M,500M,L,*
 ,,L
 EOF