yeahuh / rpms / qemu-kvm

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