This patch is sort of incomplete since the unprivileged usage path still shows the default path for the configuration file that this patch would remove for the privileged path. I think the simplest solution is to revert 86fbce56f27e. On 7/4/19 8:16 AM, Fabiano Fidêncio wrote:
86fbce56f27e removed the constant, but didn't actually adjust the only place where the constant was used.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- This patch fixes a build breakage.
It's either this, or reverting 86fbce56f27e. --- src/remote/remote_daemon.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index fdc9e4333a..3cd7b16163 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -899,9 +899,6 @@ daemonUsage(const char *argv0, bool privileged) _("\n" " Default paths:\n" "\n" - " Configuration file (unless overridden by -f):\n" - " %s\n" - "\n" " Sockets:\n" " %s\n" " %s\n" @@ -914,7 +911,6 @@ daemonUsage(const char *argv0, bool privileged) " PID file (unless overridden by -p):\n" " %s/run/libvirtd.pid\n" "\n"), - LIBVIRTD_CONFIGURATION_FILE, LIBVIRTD_PRIV_UNIX_SOCKET, LIBVIRTD_PRIV_UNIX_SOCKET_RO, LIBVIRT_CACERT,
-- Mit freundlichen Grüßen/Kind regards Boris Fiuczynski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Matthias Hartmann Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294