--- oz-0.17.0/oz/RedHat.py	2021-10-27 15:00:41.586691227 -0700
+++ oz-0.17.0/oz/RedHat.py.new	2021-10-27 15:00:47.793724028 -0700
@@ -79,6 +79,10 @@
                                         self.tdl.distro + self.tdl.update + self.tdl.arch + "-ramdisk")
 
         self.cmdline = "inst.method=" + self.url + " inst.ks=file:/ks.cfg"
+        # don't write the kickstart to the image, or else initial-setup
+        # will think a root password has been set:
+        # https://bugzilla.redhat.com/show_bug.cgi?id=2015490
+        self.cmdline += " inst.nosave=output_ks"
         if self.tdl.kernel_param:
             self.cmdline += " " + self.tdl.kernel_param
 
--- oz-0.17.0/oz/Fedora.py	2021-10-27 15:03:10.034475686 -0700
+++ oz-0.17.0/oz/Fedora.py.new	2021-10-27 15:00:03.652490777 -0700
@@ -293,6 +293,10 @@
             # out the method completely
             if not self.config.brokenisomethod:
                 initrdline += " inst.method=cdrom:/dev/cdrom"
+        # don't write the kickstart to the image, or else initial-setup
+        # will think a root password has been set:
+        # https://bugzilla.redhat.com/show_bug.cgi?id=2015490
+        initrdline += " inst.nosave=output_ks"
         self._modify_isolinux(initrdline)
 
     def generate_diskimage(self, size=10, force=False):