From 5774109012b9b86b8b495aac907dd04f7ec83373 Mon Sep 17 00:00:00 2001
From: Dan Streetman <ddstreet@ieee.org>
Date: Fri, 24 Apr 2026 15:15:37 -0400
Subject: [PATCH 1/2] feat: remove vm-base kiwi xml commented-out user
 configuration

The base image should not have any users created, that is handled by
cloud-init (or other means). The root user will always be created in
the image.
---
 base/images/vm-base/vm-base.kiwi | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/base/images/vm-base/vm-base.kiwi b/base/images/vm-base/vm-base.kiwi
index cf73d3a9241..b6e29ded435 100644
--- a/base/images/vm-base/vm-base.kiwi
+++ b/base/images/vm-base/vm-base.kiwi
@@ -127,10 +127,4 @@
         <package name="shim" arch="x86_64" />
         <package name="shim" arch="aarch64" />
     </packages>
-
-    <!--
-    <users>
-        <user name="root" password="INSERT-PASSWORD-HERE" groups="root" />
-    </users>
-    -->
 </image>

From b962b8c443258c68ce818ef591d0160c92f84e76 Mon Sep 17 00:00:00 2001
From: Dan Streetman <ddstreet@ieee.org>
Date: Wed, 22 Apr 2026 12:52:26 -0400
Subject: [PATCH 2/2] feat: remove vm-base kiwi xml initrd element to disable
 UKI creation

This removes the vm-base kiwi configuration that disables UEFI UKI
creation, as that (i.e. disabled; don't create a UKI) is already the
default action.
---
 base/images/vm-base/vm-base.kiwi | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/base/images/vm-base/vm-base.kiwi b/base/images/vm-base/vm-base.kiwi
index b6e29ded435..2178c29163d 100644
--- a/base/images/vm-base/vm-base.kiwi
+++ b/base/images/vm-base/vm-base.kiwi
@@ -27,9 +27,6 @@
             efipartsize="200">
             <bootloader name="grub2" timeout="0" />
             <size unit="M">4096</size>
-            <initrd action="setup">
-                <dracut uefi="false"/>
-            </initrd>
         </type>
     </preferences>