Fixes for anaconda changes

This commit is contained in:
Peter Robinson 2021-02-10 00:14:11 +00:00
parent 95d6f61de2
commit 44bdd4b40b
2 changed files with 46 additions and 1 deletions

41
oz-anaconda-fixes.patch Normal file
View File

@ -0,0 +1,41 @@
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 @@
self._copy_kickstart(os.path.join(self.iso_contents, "ks.cfg"))
if self.config.use_dev_cdrom_device:
- initrdline = " append initrd=initrd.img ks=cdrom:/dev/cdrom:/ks.cfg"
+ initrdline = " append initrd=initrd.img inst.ks=cdrom:/dev/cdrom:/ks.cfg"
else:
- initrdline = " append initrd=initrd.img ks=cdrom:/ks.cfg"
+ initrdline = " append initrd=initrd.img inst.ks=cdrom:/ks.cfg"
if self.tdl.installtype == "url":
if self.config.haverepo:
- initrdline += " repo="
+ initrdline += " inst.repo="
else:
- initrdline += " method="
+ initrdline += " inst.method="
initrdline += self.url
else:
# if the installtype is iso, then due to a bug in anaconda we leave
# out the method completely
if not self.config.brokenisomethod:
- initrdline += " method=cdrom:/dev/cdrom"
+ initrdline += " inst.method=cdrom:/dev/cdrom"
self._modify_isolinux(initrdline)
def generate_diskimage(self, size=10, force=False):
diff --color -Nur oz-0.17.0.orig/oz/RedHat.py oz-0.17.0/oz/RedHat.py
--- oz-0.17.0.orig/oz/RedHat.py 2021-02-09 10:13:48.011870545 -0800
+++ oz-0.17.0/oz/RedHat.py 2021-02-09 12:17:36.910316424 -0800
@@ -78,7 +78,7 @@
self.initrdcache = os.path.join(self.data_dir, "kernels",
self.tdl.distro + self.tdl.update + self.tdl.arch + "-ramdisk")
- self.cmdline = "method=" + self.url + " ks=file:/ks.cfg"
+ self.cmdline = "inst.method=" + self.url + " inst.ks=file:/ks.cfg"
if self.tdl.kernel_param:
self.cmdline += " " + self.tdl.kernel_param

View File

@ -1,6 +1,6 @@
Name: oz
Version: 0.17.0
Release: 15%{?dist}
Release: 16%{?dist}
Summary: Library and utilities for automated guest OS installs
License: LGPLv2
URL: http://github.com/clalancette/oz
@ -28,6 +28,7 @@ Patch16: 0002-aarch64-Less-strict-CPU-checking-for-armv7-guests-on.patch
Patch17: 0003-fedora-default-to-F30-for-versions-30.patch
# https://github.com/clalancette/oz/pull/283
Patch18: oz-guest-always-use-cpu-host-passthrough.patch
Patch19: oz-anaconda-fixes.patch
BuildArch: noarch
@ -106,6 +107,9 @@ fi
%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
%changelog
* Wed Feb 10 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 0.17.0-16
- Fixes for anaconda changes
* Tue Feb 09 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 0.17.0-15
- fix patch for newer Fedora releases