shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-27 10:25:25 +03:00
Code Issues Projects Releases Wiki Activity

createpool: Don't unconditionally use /var/lib/libvirt

Browse Source 
Doesn't make sense for session URIs
This commit is contained in:
Cole Robinson 2015-05-02 19:54:14 -04:00
parent 45e6cd4cac
commit 252c216fb9
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
virtManager/createpool.py
View File

@ -381,8 +381,9 @@ class vmmCreatePool(vmmGObjectUI):
self.widget("pool-source-path").get_child().set_text(source)
def browse_target_path(self, ignore1=None):
startfolder = StoragePool.get_default_dir(self.conn.get_backend())
target = self._browse_file(_("Choose target directory"),
startfolder="/var/lib/libvirt",
startfolder=startfolder,
foldermode=True)
if target:
self.widget("pool-target-path").get_child().set_text(target)

23
virtinst/storage.py
View File

@ -29,11 +29,10 @@ from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
from . import util
DEFAULT_DEV_TARGET = "/dev"
DEFAULT_LVM_TARGET_BASE = "/dev/"
DEFAULT_DIR_TARGET_BASE = "/var/lib/libvirt/images/"
DEFAULT_SCSI_TARGET = "/dev/disk/by-path"
DEFAULT_MPATH_TARGET = "/dev/mapper"
_DEFAULT_DEV_TARGET = "/dev"
_DEFAULT_LVM_TARGET_BASE = "/dev/"
_DEFAULT_SCSI_TARGET = "/dev/disk/by-path"
_DEFAULT_MPATH_TARGET = "/dev/mapper"
class _StoragePermissions(XMLBuilder):
@ -311,18 +310,18 @@ class StoragePool(_StorageObject):
if (self.type == self.TYPE_DIR or
self.type == self.TYPE_NETFS or
self.type == self.TYPE_FS):
return (DEFAULT_DIR_TARGET_BASE + self.name)
return os.path.join(self.get_default_dir(self.conn), self.name)
if self.type == self.TYPE_LOGICAL:
name = self.name
if self.source_name:
name = self.source_name
return DEFAULT_LVM_TARGET_BASE + name
return _DEFAULT_LVM_TARGET_BASE + name
if self.type == self.TYPE_DISK:
return DEFAULT_DEV_TARGET
return _DEFAULT_DEV_TARGET
if self.type == self.TYPE_ISCSI or self.type == self.TYPE_SCSI:
return DEFAULT_SCSI_TARGET
return _DEFAULT_SCSI_TARGET
if self.type == self.TYPE_MPATH:
return DEFAULT_MPATH_TARGET
return _DEFAULT_MPATH_TARGET
raise RuntimeError("No default target_path for type=%s" % self.type)
def _get_default_uuid(self):
@ -350,10 +349,10 @@ class StoragePool(_StorageObject):
srcname = "gv0"
elif ("target_path" in self._propstore and
self.target_path and
self.target_path.startswith(DEFAULT_LVM_TARGET_BASE)):
self.target_path.startswith(_DEFAULT_LVM_TARGET_BASE)):
# If there is a target path, parse it for an expected VG
# location, and pull the name from there
vg = self.target_path[len(DEFAULT_LVM_TARGET_BASE):]
vg = self.target_path[len(_DEFAULT_LVM_TARGET_BASE):]
srcname = vg.split("/", 1)[0]
return srcname