From patchwork Fri Mar 26 08:05:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 28122 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 BBD3F27BC5D; Fri, 26 Mar 2021 08:06:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 83E3B27BC5C for ; Fri, 26 Mar 2021 08:06:09 +0000 (GMT) Received: from localhost ([::1]:36700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPhTs-0004t7-P3 for patchwork@mira.cbaines.net; Fri, 26 Mar 2021 04:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPhTm-0004sv-8X for guix-patches@gnu.org; Fri, 26 Mar 2021 04:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPhTl-0004Z6-Vl for guix-patches@gnu.org; Fri, 26 Mar 2021 04:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lPhTl-00025c-R0 for guix-patches@gnu.org; Fri, 26 Mar 2021 04:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47407] [PATCH] gnu: guix: Fix openrc init scripts. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Mar 2021 08:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47407 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47407@debbugs.gnu.org Cc: zimoun X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16167459438006 (code B ref -1); Fri, 26 Mar 2021 08:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2021 08:05:43 +0000 Received: from localhost ([127.0.0.1]:40301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPhTT-000253-4a for submit@debbugs.gnu.org; Fri, 26 Mar 2021 04:05:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:38088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPhTR-00024w-6z for submit@debbugs.gnu.org; Fri, 26 Mar 2021 04:05:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPhTR-0004lb-0q for guix-patches@gnu.org; Fri, 26 Mar 2021 04:05:41 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPhTM-0004Kb-4y for guix-patches@gnu.org; Fri, 26 Mar 2021 04:05:40 -0400 Received: by mail-wr1-x42a.google.com with SMTP id j18so4733269wra.2 for ; Fri, 26 Mar 2021 01:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/dexsnbi0uDApKS9nRmkWsnZ6UrFihBWQogXt27O4/s=; b=L8kXDCAuKyd3aMtdm3WhyT7EiFkgtawcvm88Ptz/gkva4SwMWaz3UmW1bTJC6Y/JhR e0dAK0FOzGXSiHzYj7meGzTrabI4/hI3ZbzYcUcoso7di3uJnNfIboAzPWmXQYBOBkCp pe5ZOCNBn4hCNjmSQh4VoYVf6KLfOnvQ128q5RTloDZBqj8RBEfcTUg9DoKXYtguBzsr 8kcU1iOLgUPQs50Mmo/yb84ru58nA2p0Sq9f5RPPyvjdioJAFDNneZbNVStCYpkl0ZQu wKB5RFRzXrqp4PgYHjwrMgZQKJqAIaXHCKscfPKKv8Xtnc3/XdFs2e8eLC2Han6EKMaM jEPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/dexsnbi0uDApKS9nRmkWsnZ6UrFihBWQogXt27O4/s=; b=tgmrcEwYGzXqC80XicYmQ6tTg7L2tsxBlTdxmKnMjwVkdhasnN1/ntQw8nIpsc+sYy A2nb6Rv5RlaC3clpf45JKh+54qPo0jp52ztmzfNIShxvvkmNji6eVQN8nIt7TaPeV5vJ 7Qhj4Dcitd1elR3oRPjVbMMi+A5UvdA/EEzdUvUxWBfh4vBORASbfJ+Ag3ZZXEso37ML QQI3BTrKwATCIEmna0yjn3bhgAg3J5jLo+U+g14yRVTOgJ66RFwektrAkw02YJD1vDee xcHHm7FaDQKnT2/vjIk8W8ou6AWfhBpyRfQgxiWYnoJCN79QhkIswbP+GIX2uSrkHZKt wIwA== X-Gm-Message-State: AOAM533My2w1or6aX22+2NehDRll8XRL5KNk6DAJXS7ZtMledzZLkmWy MNBF//VuJxNdj5au6R6EZ2UX5ErTT80= X-Google-Smtp-Source: ABdhPJw+oKpATQQOxerMi+m8rzKdPBGRsTkWdxlo3zSFnPc1yQeScTNAQVydOMfYbLw87fVsADwSWQ== X-Received: by 2002:a5d:564b:: with SMTP id j11mr13242131wrw.326.1616745933687; Fri, 26 Mar 2021 01:05:33 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id i8sm11015913wrx.43.2021.03.26.01.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 01:05:33 -0700 (PDT) From: zimoun Date: Fri, 26 Mar 2021 09:05:15 +0100 Message-Id: <20210326080515.29679-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches Fixes . * gnu/packages/package-management.scm (guix): [arguments]: Fix openrc init. * nix/local.mk: Likewise. --- Hi, The patch is tested using: $ ls $(./pre-inst-env guix build guix \ --with-git-url=guix=$(pwd) \ --with-commit=guix=028e6859ec)/etc/openrc where 028e6859ec is my commit-hash after this patch applied. Then openrc appears under the expected location. Thanks, simon gnu/packages/package-management.scm | 2 +- nix/local.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: 6e7ba45357078b31a369b23f8a9f38302dfcbb10 diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 888f54322d..e63f07c844 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -212,7 +212,7 @@ $(prefix)/etc/init.d\n"))) (substitute* "nix/local.mk" (("^openrcservicedir = .*$") (string-append "openrcservicedir = \ -$(prefix)/etc/init.d\n"))) +$(prefix)/etc/openrc\n"))) (invoke "sh" "bootstrap"))) (add-before 'build 'use-host-compressors diff --git a/nix/local.mk b/nix/local.mk index d2ce349d9c..7c438ea78c 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -181,7 +181,7 @@ etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ mv "$@.tmp" "$@" # The service script for openrc. -openrcservicedir = $(sysconfdir)/init.d +openrcservicedir = $(sysconfdir)/openrc nodist_openrcservice_DATA = etc/openrc/guix-daemon etc/openrc/guix-daemon: etc/openrc/guix-daemon.in \