[virt-tools-list] [virt-manager PATCH 5/5] unattended: Always set "media" as install-source for ISOs

Fabiano Fidêncio fidencio at redhat.com
Fri Jul 12 13:02:23 UTC 2019


Let's set "media" as installation source for all the ISOs, even the
net-installer ones, as this can be dealt with on osinfo-db side.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 .../compare/virt-install-osinfo-netinst-unattended.xml        | 2 +-
 virtinst/install/unattended.py                                | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml b/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
index 829054c8..f6892449 100644
--- a/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
+++ b/tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
@@ -13,7 +13,7 @@
     <type arch="x86_64" machine="q35">hvm</type>
     <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
     <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
-    <cmdline>ks=file:/fedora.ks inst.repo=</cmdline>
+    <cmdline>ks=file:/fedora.ks</cmdline>
   </os>
   <features>
     <acpi/>
diff --git a/virtinst/install/unattended.py b/virtinst/install/unattended.py
index e34b8ae2..e1047400 100644
--- a/virtinst/install/unattended.py
+++ b/virtinst/install/unattended.py
@@ -315,12 +315,8 @@ def _lookup_rawscript(osinfo, profile, os_media):
 def prepare_install_script(guest, unattended_data,
         url, os_media, injection_method):
     def _get_installation_source(os_media):
-        # This is ugly, but that's only the current way to deal with
-        # netinstall medias.
         if not os_media:
             return "network"
-        if os_media.is_netinst():
-            return "network"
         return "media"
 
     rawscript = _lookup_rawscript(guest.osinfo,
-- 
2.21.0




More information about the virt-tools-list mailing list