yeahuh / rpms / qemu-kvm

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