External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: re-fix help printing without connection

Browse Source 
Re-do 0217089 so it does not add regression for commit c0726e0 that allowed to
print help without making a connection to the daemon.
This commit is contained in:
Roman Bogorodskiy 2016-04-21 11:26:31 +03:00
parent ed5c929777
commit 384dde557b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/virsh.c
View File

@ -962,14 +962,16 @@ main(int argc, char **argv)
if (!vshInit(ctl, cmdGroups, NULL)) if (!vshInit(ctl, cmdGroups, NULL))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
ctl->connname = vshStrdup(ctl, virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI"));
if (!virshParseArgv(ctl, argc, argv) || if (!virshParseArgv(ctl, argc, argv) ||
!virshInit(ctl)) { !virshInit(ctl)) {
virshDeinit(ctl); virshDeinit(ctl);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!ctl->connname)
ctl->connname = vshStrdup(ctl,
virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI"));
if (!ctl->imode) { if (!ctl->imode) {
ret = vshCommandRun(ctl, ctl->cmd); ret = vshCommandRun(ctl, ctl->cmd);
} else { } else {