NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

unattended: Pass OsinfoMedia to OSInstallScript

Browse Source 
Let's pass the OsinfoMedia object down to the OSInstallScript class so
it can be used, later on, to generate the install-script and kernel
command-line specifically for the media being used.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2019-07-12 15:02:21 +02:00 committed by Cole Robinson
parent 224d29b799
commit a3b9d6ffc4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virtinst/install/unattended.py
View File

@ -125,9 +125,10 @@ class OSInstallScript:
return True return True
return False # pragma: no cover return False # pragma: no cover
def __init__(self, script, osobj): def __init__(self, script, osobj, osinfomediaobj):
self._script = script self._script = script
self._osobj = osobj self._osobj = osobj
self._osinfomediaobj = osinfomediaobj
self._config = None self._config = None
if not OSInstallScript.have_new_libosinfo(): # pragma: no cover if not OSInstallScript.have_new_libosinfo(): # pragma: no cover
@ -316,7 +317,9 @@ def prepare_install_script(guest, unattended_data,
rawscript = _lookup_rawscript(guest.osinfo, rawscript = _lookup_rawscript(guest.osinfo,
unattended_data.profile, os_media) unattended_data.profile, os_media)
script = OSInstallScript(rawscript, guest.osinfo)
osinfomediaobj = os_media.get_osinfo_media() if os_media else None
script = OSInstallScript(rawscript, guest.osinfo, osinfomediaobj)
script.set_preferred_injection_method(injection_method) script.set_preferred_injection_method(injection_method)