Don't write kickstart so initial-setup won't think root pw is set (#2015490)

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-10-26 11:19:20 -07:00
parent bf1060ad35
commit c67600ef09
2 changed files with 9 additions and 2 deletions

View File

@ -1,7 +1,7 @@
diff --color -Nur oz-0.17.0.orig/oz/Fedora.py oz-0.17.0/oz/Fedora.py
--- oz-0.17.0.orig/oz/Fedora.py 2021-02-09 10:13:48.015870550 -0800
+++ oz-0.17.0/oz/Fedora.py 2021-02-09 12:17:24.056301714 -0800
@@ -276,20 +276,20 @@
@@ -276,20 +276,24 @@
self._copy_kickstart(os.path.join(self.iso_contents, "ks.cfg"))
if self.config.use_dev_cdrom_device:
@ -24,6 +24,10 @@ diff --color -Nur oz-0.17.0.orig/oz/Fedora.py oz-0.17.0/oz/Fedora.py
if not self.config.brokenisomethod:
- initrdline += " method=cdrom:/dev/cdrom"
+ 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):

View File

@ -1,6 +1,6 @@
Name: oz
Version: 0.17.0
Release: 18%{?dist}
Release: 19%{?dist}
Summary: Library and utilities for automated guest OS installs
License: LGPLv2
URL: http://github.com/clalancette/oz
@ -106,6 +106,9 @@ fi
%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
%changelog
* Tue Oct 26 2021 Adam Williamson <awilliam@redhat.com> - 0.17.0-19
- Don't write kickstart so initial-setup won't think root pw is set (#2015490)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild