Skip to content

Commit b760b02

Browse files
authored
Fix issue with configdrive on XenServer (#10912)
1 parent bb79f0b commit b760b02

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.HashMap;
2424
import java.util.List;
2525
import java.util.Map;
26+
import java.util.Objects;
2627
import java.util.Set;
2728

2829
import com.cloud.agent.resource.virtualnetwork.VRScripts;
@@ -241,7 +242,7 @@ private void prepareDisks(VirtualMachineTO vmSpec, CitrixResourceBase citrixReso
241242
List<DiskTO> disks = new ArrayList<DiskTO>(vmSpec.getDisks().length);
242243
int index = 0;
243244
for (final DiskTO disk : vmSpec.getDisks()) {
244-
if (Volume.Type.ISO.equals(disk.getType())) {
245+
if (Volume.Type.ISO.equals(disk.getType()) && Objects.nonNull(disk.getPath())) {
245246
disks.add(0, disk);
246247
} else {
247248
disks.add(index, disk);

0 commit comments

Comments
 (0)