External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-06 20:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Alter error message in probe/empty checks

Browse Source 
For case VIR_STORAGE_BLKID_PROBE_DIFFERENT, clean up the message to
avoid using the virsh like --overwrite syntax. Additionally provide
a different error message when not writing the label to avoid confusion.
This commit is contained in:
John Ferlan 2017-01-13 07:33:02 -05:00
parent f462f9ad6e
commit 40ec4ff658
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/storage/storage_backend.c
View File

@ -2808,10 +2808,17 @@ virStorageBackendBLKIDFindEmpty(const char *device,
break;
case VIR_STORAGE_BLKID_PROBE_DIFFERENT:
virReportError(VIR_ERR_STORAGE_POOL_BUILT,
_("Device '%s' formatted cannot overwrite using '%s', "
"requires build --overwrite"),
device, format);
if (writelabel)
virReportError(VIR_ERR_STORAGE_POOL_BUILT,
_("Format of device '%s' does not match the "
"expected format '%s', forced overwrite is "
"necessary"),
device, format);
else
virReportError(VIR_ERR_OPERATION_INVALID,
_("Format of device '%s' does not match the "
"expected format '%s'"),
device, format);
break;
}