From patchwork Thu Apr 11 07:34:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 62919 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 495B227BBE9; Thu, 11 Apr 2024 08:36:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 772F727BBE2 for ; Thu, 11 Apr 2024 08:36:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruoyW-0006z2-8P; Thu, 11 Apr 2024 03:36:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruoyU-0006yZ-HY for guix-patches@gnu.org; Thu, 11 Apr 2024 03:35:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ruoyT-0007Aw-Aq for guix-patches@gnu.org; Thu, 11 Apr 2024 03:35:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ruoyc-0004TX-0c for guix-patches@gnu.org; Thu, 11 Apr 2024 03:36:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70333] [PATCH 2/2] doc: contributing: Move localstatedir instructions. References: <20240411072114.16195-1-pelzflorian@pelzflorian.de> In-Reply-To: <20240411072114.16195-1-pelzflorian@pelzflorian.de> Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Apr 2024 07:36:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70333 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70333@debbugs.gnu.org Cc: Florian Pelz Received: via spool by 70333-submit@debbugs.gnu.org id=B70333.171282094417062 (code B ref 70333); Thu, 11 Apr 2024 07:36:05 +0000 Received: (at 70333) by debbugs.gnu.org; 11 Apr 2024 07:35:44 +0000 Received: from localhost ([127.0.0.1]:54817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruoyF-0004R3-Jl for submit@debbugs.gnu.org; Thu, 11 Apr 2024 03:35:44 -0400 Received: from relay.yourmailgateway.de ([46.38.247.119]:41871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruoyB-0004QO-Uu for 70333@debbugs.gnu.org; Thu, 11 Apr 2024 03:35:41 -0400 Received: from mors-relay-8404.netcup.net (localhost [127.0.0.1]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4VFWh15tszz81ZW for <70333@debbugs.gnu.org>; Thu, 11 Apr 2024 09:35:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1712820929; bh=+7nrAN9DC7dMhg0+QkP3PMUXjT3SxeyA11DAe6qzNM8=; h=From:To:Cc:Subject:Date:From; b=Bf1a+JCHp7tJuqb9zlhqJQKA29pJCjD0yfnivbk3nTUAmfXklG8+Z9AhuK8yADBxl tdozFfLIG9aTIzLdVYcZOcncHBQHy85f85DgwXQKPDYlTKw2YiKstlghi0s9MQbk2a 6FTNG5HIQ1ql+A1wc3uGYgHVBAmkYvtOJ6rv9QLi7aoghZFI1BEFbc+bVPYQ8G86yU /eoUXiZ3tnaTXyzOhiAgxnZcjAq+6bNCFu0Ilh21tZiC1qLssz09Iy2PH+mwtPrved A0cAUmjy5EGarqp/8UesiaFEQbDeA8D5t2itmt9/WFHRM5nDLzP21WliByP56CUZi6 7WexEniXMzB/g== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4VFWh15W42z4yP9 for <70333@debbugs.gnu.org>; Thu, 11 Apr 2024 09:35:29 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VFWh145rYz8sch for <70333@debbugs.gnu.org>; Thu, 11 Apr 2024 09:35:29 +0200 (CEST) Received: from florianrock64.fritz.box (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 947CC82DB5; Thu, 11 Apr 2024 09:35:22 +0200 (CEST) From: Florian Pelz Date: Thu, 11 Apr 2024 09:34:50 +0200 Message-ID: <20240411073450.17958-2-pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 947CC82DB5 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: oCcLYyAhgq2GDjERTQZf85tPLnaPFq9ZOe7imxgLCZ2noIqQDq+pqYK/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * doc/contributing.texi (Requirements): Move localstatedir ... (Building from Git): ... here. Change-Id: I860bb7a9e6aea12881469c667496364248293c31 --- doc/contributing.texi | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index cfe8b1289b..66f4e86d0a 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -126,23 +126,6 @@ following packages are also needed: C++11 standard. @end itemize -@cindex state directory -@cindex localstatedir -@cindex system configuration directory -@cindex sysconfdir -When configuring Guix on a system that already has a Guix installation, -be sure to specify the same state directory as the existing installation -using the @option{--localstatedir} option of the @command{configure} -script (@pxref{Directory Variables, @code{localstatedir},, standards, -GNU Coding Standards}). Usually, this @var{localstatedir} option is set -to the value @file{/var}. The @command{configure} script protects -against unintended misconfiguration of @var{localstatedir} so you do not -inadvertently corrupt your store (@pxref{The Store}). The configuration -directory should also be configured by setting the @option{--sysconfdir} -option to the @file{/etc} value, which is the location used by Guix to -store for example the access control list of authorized machines and the -definition of offload machines. - @node Building from Git @section Building from Git @@ -245,6 +228,10 @@ export ACLOCAL_PATH=/usr/share/aclocal @xref{Macro Search Path,,, automake, The GNU Automake Manual}, for more information. +@cindex state directory +@cindex localstatedir +@cindex system configuration directory +@cindex sysconfdir Then, run: @example @@ -259,6 +246,19 @@ normal @code{sysconfdir} value. Note that you will probably not run important to pass the right @code{localstatedir} and @code{sysconfdir} values, which get recorded in the @code{(guix config)} Guile module. +When configuring Guix on a system that already has a Guix installation, +be sure to specify the same state directory as the existing installation +using the @option{--localstatedir} option of the @command{configure} +script (@pxref{Directory Variables, @code{localstatedir},, standards, +GNU Coding Standards}). Usually, this @var{localstatedir} option is set +to the value @file{/var}. The @command{configure} script protects +against unintended misconfiguration of @var{localstatedir} so you do not +inadvertently corrupt your store (@pxref{The Store}). The configuration +directory should also be configured by setting the @option{--sysconfdir} +option to the @file{/etc} value, which is the location used by Guix to +store for example the access control list of authorized machines and the +definition of offload machines. + Finally, you can build Guix and, if you feel so inclined, run the tests (@pxref{Running the Test Suite}):