From patchwork Thu May 2 18:58:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1094513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44w4RW26XJz9sD4 for ; Fri, 3 May 2019 05:03:35 +1000 (AEST) Received: from localhost ([127.0.0.1]:57388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGzV-0006Jw-2j for incoming@patchwork.ozlabs.org; Thu, 02 May 2019 15:03:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvm-0003jj-AY for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvh-00034G-VK for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:41 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:43023) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvf-00033M-UL; Thu, 02 May 2019 14:59:37 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MploR-1gyyBN4BJN-00qDii; Thu, 02 May 2019 20:58:53 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:27 +0200 Message-Id: <20190502185835.15185-6-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:EuFW6QXXDhfSBoO1sW1/UpU4tStfXqkjNUl5Qim3N6zbnDiHy/K SCms3QSP2GMuS5W5tH7CR8vYoLgxir32oTn5V2PGKPe8JMCeVyccG4YTxyH9aaDcRDaXCCO 0hq8TtP3h67eyp1cRVOn0pQZOf0H/g+ctEIOwNllIgd1SUgjBJAa62BRkI1Te+5b0GhOLoe D4Rg9TokUeFWw8D300Wsw== X-UI-Out-Filterresults: notjunk:1; V03:K0:hoDHAHMzAj4=:SWm2wVIyRvcOI1GsCp0Bj0 tOywv8KcH+ASk1Fws3BFCQ552mzcict0QUMUFW890qKpJhespBSt8dEo4tUm5F1ysXpnngoy6 hDOGLUzz12DZQrBMKVn/vraCcssnVMf9oKZKfryF4y+39E+URCFTH1BeBBHGMhqSyyk0dWr59 ZPSQHKEqnXb/SLR0z8/TAv08rfiMvWBXEVPlI/vgc+FmL8Pm8YSlgTeMBYCOgMw+BzWEYE15b D9sO99LpRoSISfUVwXABWGpoF/Xm1L7x1grInXqOt48gu0qsnEHmRR3xyx61CXEd52GYEr3RQ 9FZ+edObcxDiml59lDJDtBRUB1mb3a9v3YBvMJO82OXOZAI7cvMfHutu/UVL1wZL3JPjgCnlt V/tDyluGZ0JpDMo8Vq94EoYh5duVCgOdVQBcxGdUdqKZxUBnp1v/TXDN4Zx8ClFR5LtMYiQWg SHAo9fhHh8wHwS8CV0rMAofHCoxPovwCCd/A8Otrf0fgD6jc3GJpaDSfD/s8yCrf4YA13VNJe JifLnjaBU2wwwJN5V9MQGO2AhCQNzPKiuyQvJbFY/BYS0B4at3X0aO6vpPClC1yF69+TM0tvg 615Jdn33PiGnOZmzD3dnBpOZuTWcS0pS50dUPMrYAiXew4t8tjBtYYQ+oqQkqeSAgoy0EJt40 SDE/Q4Mp1kRNLSHhj3zhQ6QgzgI2hueHU/oCihnbItioVRXBFWmlXxN+ohBC2F6E4mQ8PRKJg ZYzMzNlQ6VvNVJnWw5JGLqNpQSDmGFjeIE0kH69BlJTgPIQ/FNdN8A0rLPQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 05/13] doc: fix the configuration path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?utf-8?q?Andreas_F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20181126105125.30973-1-marcandre.lureau@redhat.com> Signed-off-by: Laurent Vivier --- qemu-ga.texi | 4 ++-- Makefile | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qemu-ga.texi b/qemu-ga.texi index 4c7a8fd16329..f00ad830f283 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}). diff --git a/Makefile b/Makefile index 1211e78c91ed..43a7a047b452 100644 --- a/Makefile +++ b/Makefile @@ -899,11 +899,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 \