33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
|
Index: virt-manager-0.10.0/virtinst/DistroInstaller.py
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-0.10.0.orig/virtinst/DistroInstaller.py
|
||
|
|
+++ virt-manager-0.10.0/virtinst/DistroInstaller.py
|
||
|
|
@@ -442,7 +442,7 @@ class DistroInstaller(Installer.Installe
|
||
|
|
return False
|
||
|
|
|
||
|
|
is_url = not self._location_is_path
|
||
|
|
- mount_dvd = self._location_is_path and not self.cdrom
|
||
|
|
+ mount_dvd = self._location_is_path and self.cdrom
|
||
|
|
|
||
|
|
return bool(is_url or mount_dvd)
|
||
|
|
|
||
|
|
@@ -451,11 +451,14 @@ class DistroInstaller(Installer.Installe
|
||
|
|
|
||
|
|
dev = None
|
||
|
|
if self.cdrom:
|
||
|
|
- if self.location:
|
||
|
|
- dev = self._prepare_cdrom(guest, meter)
|
||
|
|
+ if self.is_xenpv() and guest._lookup_osdict_key('pv_cdrom_install'):
|
||
|
|
+ dev = self._prepare_kernel_and_initrd(guest, meter)
|
||
|
|
else:
|
||
|
|
- # Booting from a cdrom directly allocated to the guest
|
||
|
|
- pass
|
||
|
|
+ if self.location:
|
||
|
|
+ dev = self._prepare_cdrom(guest, meter)
|
||
|
|
+ else:
|
||
|
|
+ # Booting from a cdrom directly allocated to the guest
|
||
|
|
+ pass
|
||
|
|
else:
|
||
|
|
dev = self._prepare_kernel_and_initrd(guest, meter)
|
||
|
|
|