Skip to content

Commit c7561ec

Browse files
Update ovftool, virt-v2v version check cmds to run with quotes
1 parent f24b175 commit c7561ec

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -314,15 +314,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
314314

315315
public static final String TUNGSTEN_PATH = "scripts/vm/network/tungsten";
316316

317-
public static final String INSTANCE_CONVERSION_SUPPORTED_CHECK_CMD = "virt-v2v --version";
317+
public static final String INSTANCE_CONVERSION_SUPPORTED_CHECK_CMD = "\"virt-v2v --version\"";
318318
// virt-v2v --version => sample output: virt-v2v 1.42.0rhel=8,release=22.module+el8.10.0+1590+a67ab969
319-
public static final String OVF_EXPORT_SUPPORTED_CHECK_CMD = "ovftool --version";
319+
public static final String OVF_EXPORT_SUPPORTED_CHECK_CMD = "\"ovftool --version\"";
320320
// ovftool --version => sample output: VMware ovftool 4.6.0 (build-21452615)
321-
public static final String OVF_EXPORT_TOOl_GET_VERSION_CMD = "ovftool --version | awk '{print $3}'";
321+
public static final String OVF_EXPORT_TOOl_GET_VERSION_CMD = "\"ovftool --version | awk '{print $3}'\"";
322322

323-
public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "rpm -qa | grep -i virtio-win";
324-
public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "dpkg -l virtio-win";
325-
public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "dpkg -l nbdkit";
323+
public static final String WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"rpm -qa | grep -i virtio-win\"";
324+
public static final String UBUNTU_WINDOWS_GUEST_CONVERSION_SUPPORTED_CHECK_CMD = "\"dpkg -l virtio-win\"";
325+
public static final String UBUNTU_NBDKIT_PKG_CHECK_CMD = "\"dpkg -l nbdkit\"";
326326

327327
public static final int LIBVIRT_CGROUP_CPU_SHARES_MIN = 2;
328328
public static final int LIBVIRT_CGROUP_CPU_SHARES_MAX = 262144;

0 commit comments

Comments
 (0)