Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/qubes-manager
This commit is contained in:
		
						commit
						4dc978a048
					
				| @ -1661,6 +1661,9 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow): | |||||||
|                 for d in self.blk_manager.free_devs: |                 for d in self.blk_manager.free_devs: | ||||||
|                     if d.startswith(vm.name): |                     if d.startswith(vm.name): | ||||||
|                         continue |                         continue | ||||||
|  |                     # skip partitions heuristic | ||||||
|  |                     if d[-1].isdigit() and d[0:-1] in self.blk_manager.current_blk: | ||||||
|  |                         continue | ||||||
|                     text = "Attach  " + d + " " + unicode(self.blk_manager.free_devs[d]['size']) + " " + self.blk_manager.free_devs[d]['desc'] |                     text = "Attach  " + d + " " + unicode(self.blk_manager.free_devs[d]['size']) + " " + self.blk_manager.free_devs[d]['desc'] | ||||||
|                     action = self.blk_menu.addAction(QIcon(":/add.png"), text) |                     action = self.blk_menu.addAction(QIcon(":/add.png"), text) | ||||||
|                     action.setData(QVariant(d)) |                     action.setData(QVariant(d)) | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Joanna Rutkowska
						Joanna Rutkowska