From f6566612b98bf4c4f61f5ba981f2bf68b8b875d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <work@tfloure.ch>
Date: Tue, 16 Apr 2024 09:56:12 +0200
Subject: [PATCH] [ONE images] fedora/rocky, disable grub's os-prober, set
 hostname

---
 opennebula-images/fedora-build-opennebula-image.sh | 3 ++-
 opennebula-images/rocky-build-opennebula-image.sh  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/opennebula-images/fedora-build-opennebula-image.sh b/opennebula-images/fedora-build-opennebula-image.sh
index 76a649b..20d584d 100755
--- a/opennebula-images/fedora-build-opennebula-image.sh
+++ b/opennebula-images/fedora-build-opennebula-image.sh
@@ -144,6 +144,7 @@ kernel_version=$(ls /mnt/boot | grep "vmlinuz.*.$ARCH" | cut -d- -f2-)
 run_root dracut --force --kver $kernel_version
 
 # Configure grub2.
+echo "GRUB_DISABLE_OS_PROBER=true" >> /mnt/etc/default/grub
 run_root grub2-install --target=i386-pc "${NBD_DEVICE}"
 run_root grub2-mkconfig -o /boot/grub2/grub.cfg
 
@@ -163,7 +164,7 @@ EOF
 run_root rm -f /etc/machine-id
 run_root touch /etc/machine-id
 rm -f /var/lib/systemd/random-seed
-run_root hostnamectl set-hostname fedora
+echo "fedora" > /mnt/etc/hostname
 
 # Remove temporary files and reclaim freed disk space.
 # Note: build logs could be removed as well.
diff --git a/opennebula-images/rocky-build-opennebula-image.sh b/opennebula-images/rocky-build-opennebula-image.sh
index 67f29ef..3b17c1e 100755
--- a/opennebula-images/rocky-build-opennebula-image.sh
+++ b/opennebula-images/rocky-build-opennebula-image.sh
@@ -148,6 +148,7 @@ kernel_version=$(ls /mnt/boot | grep "vmlinuz.*.$ARCH" | cut -d- -f2-)
 run_root dracut --force --kver $kernel_version
 
 # Configure grub2.
+echo "GRUB_DISABLE_OS_PROBER=true" >> /mnt/etc/default/grub
 run_root grub2-install --target=i386-pc "${NBD_DEVICE}"
 run_root grub2-mkconfig -o /boot/grub2/grub.cfg
 
@@ -167,7 +168,7 @@ EOF
 run_root rm -f /etc/machine-id
 run_root touch /etc/machine-id
 rm -f /var/lib/systemd/random-seed
-run_root hostnamectl set-hostname rocky
+echo "rocky" > /mnt/etc/hostname
 
 # Remove temporary files and reclaim freed disk space.
 # Note: build logs could be removed as well.