26 lines
1007 B
Diff
26 lines
1007 B
Diff
|
Subject: virt-install: Fix error checking extra_args
|
||
|
|
From: Cole Robinson crobinso@redhat.com Wed Nov 2 10:27:14 2016 -0400
|
||
|
|
Date: Wed Nov 2 10:27:14 2016 -0400:
|
||
|
|
Git: 7962672c713cf6d35e770f0d00068dee707b6ec9
|
||
|
|
|
||
|
|
Later bits in the code that want to warn based on extra_args content
|
||
|
|
don't handle the None case. Be consistent and convert it to a list
|
||
|
|
everywhere.
|
||
|
|
|
||
|
|
Mentioned at https://bugzilla.redhat.com/show_bug.cgi?id=1376547#c9
|
||
|
|
|
||
|
|
Index: virt-manager-1.4.0/virt-install
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-1.4.0.orig/virt-install
|
||
|
|
+++ virt-manager-1.4.0/virt-install
|
||
|
|
@@ -595,7 +595,8 @@ def build_guest_instance(conn, options):
|
||
|
|
convert_old_os_options(options)
|
||
|
|
|
||
|
|
# non-xml install options
|
||
|
|
- guest.installer.extraargs = options.extra_args or []
|
||
|
|
+ options.extra_args = options.extra_args or []
|
||
|
|
+ guest.installer.extraargs = options.extra_args
|
||
|
|
guest.installer.initrd_injections = options.initrd_inject
|
||
|
|
guest.autostart = options.autostart
|
||
|
|
|