shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-03-08 04:58:29 +03:00
Code Issues Projects Releases Wiki Activity

installertreemedia: Respect os_variant when setting kernel_url_arg

Browse Source 
Currently, the kernel_url_arg is get based on the cached data. However,
when the cached data is created, the store is already set to a "generic"
distro and the os_variant is not respected when getting the
kernel_url_arg.

In order to avoid ignoring os_variant when looking up the kernel_url_arg,
let's also take into the consideration the the os_variant passed via
command line, which was used to set Guest's osinfo name, returning then
the expected value to the caller.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2019-11-20 17:54:22 +01:00 committed by Cole Robinson
parent b78b8a96cf
commit 1d9d91910a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
virtinst/install/installertreemedia.py
View File

@ -241,7 +241,12 @@ class InstallerTreeMedia(object):
self._tmpfiles.append(scriptpath)
self._initrd_injections.append((scriptpath, expected_filename))
def _prepare_kernel_args(self, cache, unattended_scripts):
def _prepare_kernel_url_arg(self, guest, cache):
os_variant = cache.os_variant or guest.osinfo.name
osobj = OSDB.lookup_os(os_variant)
return osobj.get_kernel_url_arg()
def _prepare_kernel_args(self, guest, cache, unattended_scripts):
install_args = None
if unattended_scripts:
args = []
@ -252,8 +257,10 @@ class InstallerTreeMedia(object):
args.append(cmdline)
install_args = (" ").join(args)
log.debug("Generated unattended cmdline: %s", install_args)
elif self.is_network_url() and cache.kernel_url_arg:
install_args = "%s=%s" % (cache.kernel_url_arg, self.location)
elif self.is_network_url():
kernel_url_arg = self._prepare_kernel_url_arg(guest, cache)
if kernel_url_arg:
install_args = "%s=%s" % (kernel_url_arg, self.location)
if install_args:
self._extra_args.append(install_args)
@ -274,7 +281,7 @@ class InstallerTreeMedia(object):
cache = self._get_cached_data(guest, fetcher)
self._prepare_unattended_data(unattended_scripts)
kernel_args = self._prepare_kernel_args(cache, unattended_scripts)
kernel_args = self._prepare_kernel_args(guest, cache, unattended_scripts)
kernel, initrd = self._prepare_kernel_url(guest, cache, fetcher)
return kernel, initrd, kernel_args