From 020cc7b26a22caf8984ecadd114904388333ed1d Mon Sep 17 00:00:00 2001 From: Danilo de Paula Date: Fri, 8 Feb 2019 11:51:14 +0000 Subject: [PATCH 1/4] doc: fix the configuration path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Danilo de Paula Message-id: <20190208115114.24850-2-ddepaula@redhat.com> Patchwork-id: 84320 O-Subject: [RHEL8/rhel qemu-kvm PATCH v2 1/1] doc: fix the configuration path Bugzilla: 1645411 RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Marc-André Lureau RH-Acked-by: Stefano Garzarella RH-Acked-by: Wainer dos Santos Moschetta From: Marc-André Lureau Use a CONFDIR variable to show the configured sysconf path in the generated documentations (html, man pages etc). Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1644985 Signed-off-by: Marc-André Lureau Signed-off-by: Danilo C. L. de Paula --- Makefile | 9 ++++++--- qemu-ga.texi | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index da3eedb..865602d 100644 --- a/Makefile +++ b/Makefile @@ -919,11 +919,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \ MAKEINFO=makeinfo MAKEINFOINCLUDES= -I docs -I $( $@,"GEN","$@") +docs/version.texi: $(SRC_PATH)/VERSION config-host.mak + $(call quiet-command,(\ + echo "@set VERSION $(VERSION)" && \ + echo "@set CONFDIR $(qemu_confdir)" \ + )> $@,"GEN","$@") %.html: %.texi docs/version.texi $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \ diff --git a/qemu-ga.texi b/qemu-ga.texi index 4c7a8fd..f00ad83 100644 --- a/qemu-ga.texi +++ b/qemu-ga.texi @@ -30,7 +30,7 @@ set user's password @end itemize qemu-ga will read a system configuration file on startup (located at -@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining +@file{@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining configuration options on the command line. For the same key, the last option wins, but the lists accumulate (see below for configuration file format). @@ -58,7 +58,7 @@ file format). Enable fsfreeze hook. Accepts an optional argument that specifies script to run on freeze/thaw. Script will be called with 'freeze'/'thaw' arguments accordingly (default is - @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do + @samp{@value{CONFDIR}/fsfreeze-hook}). If using -F with an argument, do not follow -F with a space (for example: @samp{-F/var/run/fsfreezehook.sh}). -- 1.8.3.1