virt-manager/virtinst-cdrom.diff
Charles Arnold 6505c36ecc - Upstream bug fixes
virtman-netstats-fix.diff                                                           
  virtman-finish-button-fix.diff                                                      
  virtman-shutoff-fix.diff                                                            
  virtman-set-has-window-fix.diff                                                     
  virtman-grep-fix.diff                                                               
  virtman-no-cd-present-fix.diff                                                      
  virtman-resize-menu-fix.diff                                                        
  virtman-vcpu-count-fix.diff                                                         
  virtman-storage-pool-fix.diff                                                       
  virtman-domain-name-fix.diff                                                        
  virtman-unapplied-changes-fix.diff                                                  
  virtman-details-fix.diff                                                            
  virtman-delete-fix.diff                                                             
  virtman-collidelist-fix.diff                                                        
  virtman-char-device-mode-fix.diff                                                   
  virtinst-hv-version-fix.diff                                                        
  virtinst-initrd-inject-fix.diff                                                     
  virtinst-initrd-inject2-fix.diff                                                    
  virtinst-no-volume-fix.diff                                                         
  virtinst-prompts-fix.diff                                                           
  virtinst-cpu-model-name-fix.diff                                                    
  virtinst-xml-clear-fix.diff                                                         
  virtinst-remote-storage-fix.diff                                                    
  virtinst-error-message-fix.diff                                                     
  virtinst-typo-fix.diff                                                              
  virtinst-cdrom.diff                                                                 
  virtinst-storage-ocfs2.diff

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=63
2011-09-21 16:55:07 +00:00

29 lines
1.1 KiB
Diff

Index: virtinst-0.600.0/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.600.0.orig/virtinst/VirtualDisk.py
+++ virtinst-0.600.0/virtinst/VirtualDisk.py
@@ -1718,14 +1718,18 @@ class VirtualDisk(VirtualDevice):
self.target = "hdc"
return self.target
- # Regular scanning
+ # Start cdrom at 'c' and skip 'c' for non-cdrom
for i in range(maxnode):
gen_t = "%s%c" % (prefix, ord('a') + i)
- if gen_t in except_targets:
- continue
if gen_t not in skip_targets:
- self.target = gen_t
- return self.target
+ if self.device != self.DEVICE_CDROM:
+ if i != ord('c') - ord('a'):
+ self.target = gen_t
+ return self.target
+ else:
+ if i >= ord('c') - ord('a'):
+ self.target = gen_t
+ return self.target
# Check except_targets for any options
for t in except_targets: