Merge pull request #307 from AdamWill/restore-dont-write-kickstart

Don't write kickstart so initial-setup won't think root pw is set

oz/Fedora.py

@@ -293,6 +293,10 @@ def _modify_iso(self):
             # 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):

oz/RedHat.py

@@ -79,6 +79,10 @@ def __init__(self, tdl, config, auto, output_disk, nicmodel, diskbus,
                                         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