From acc56affb2f395f774cfc5d6f2362e4eeee9a77f Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mar 18 2023 15:42:38 +0000 Subject: [PATCH 1/3] config.sh: Drop creating an empty machine-id(5) file According to the documentation, an empty file triggers firstboot mode. Since we're not using a read-only root filesystem, we do not need to leverage any other tricks here and we can just have no file present. --- diff --git a/config.sh b/config.sh index a2e67d1..5e357a9 100755 --- a/config.sh +++ b/config.sh @@ -29,7 +29,6 @@ setsebool -P selinuxuser_execmod 1 #-------------------------------------- ## Clear machine-id on pre generated images rm -f /etc/machine-id -touch /etc/machine-id ## remove random seed, the newly installed instance should make its own rm -f /var/lib/systemd/random-seed From 98b6bf5dd85939ad191e72c662fecc911c9d4d5a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mar 18 2023 16:28:45 +0000 Subject: [PATCH 2/3] config.sh: Add expected GRUB settings for Fedora setups --- diff --git a/config.sh b/config.sh index 5e357a9..c8ff97f 100755 --- a/config.sh +++ b/config.sh @@ -38,6 +38,10 @@ rm -f /var/lib/systemd/random-seed ## Works around issues with grub-bls ## See: https://github.com/OSInside/kiwi/issues/2198 echo "GRUB_DEFAULT=saved" >> /etc/default/grub +## Disable submenus to match Fedora +echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub +## Disable recovery entries to match Fedora +echo "GRUB_DISABLE_RECOVERY=true" >> /etc/default/grub #====================================== # Delete & lock the root user password From 267b932187145aefeb06115cb9f3cde2808684fe Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mar 18 2023 16:29:56 +0000 Subject: [PATCH 3/3] config.xml: Add display name for the image description This is used for setting the GRUB_DISTRIBUTOR value. --- diff --git a/config.xml b/config.xml index e39c67f..ebe2f11 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,6 @@ - + Neal Gompa ngompa@fedoraproject.org