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