virsh: read default connection uri from env later

Postpone filling out the default connection in ctl->connname
after calling virshInit.

This allows printing help without a connection to the daemon.

(cherry picked from commit c0726e0708)
This commit is contained in:
Ján Tomko authored and Cole Robinson committed 2016-04-20 09:08:58 -04:00
1 parent 849d1d7f75
commit c38669e15b
1 file changed
+3 -3
+3 -3
View File
@@ -968,9 +968,6 @@ main(int argc, char **argv)
virFileActivateDirOverride(argv[0]);
if ((defaultConn = virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI")))
ctl->connname = vshStrdup(ctl, defaultConn);
if (!vshInit(ctl, cmdGroups, NULL))
exit(EXIT_FAILURE);
@@ -980,6 +977,9 @@ main(int argc, char **argv)
exit(EXIT_FAILURE);
}
if ((defaultConn = virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI")))
ctl->connname = vshStrdup(ctl, defaultConn);
if (!ctl->imode) {
ret = vshCommandRun(ctl, ctl->cmd);
} else {