From patchwork Mon Apr 13 16:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21223 X-Patchwork-Delegate: mail@cbaines.net 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 42DF527BBE4; Mon, 13 Apr 2020 17:09:17 +0100 (BST) 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,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 ESMTP id C60DC27BBE1 for ; Mon, 13 Apr 2020 17:09:16 +0100 (BST) Received: from localhost ([::1]:46098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1e8-000580-Bl for patchwork@mira.cbaines.net; Mon, 13 Apr 2020 12:09:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59150) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1dy-000504-J4 for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jO1dw-0005Nv-FH for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49024) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jO1dv-0005ND-ND for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jO1dv-0006x4-Ih for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 1/5] nix/local.mk: Add missing comment to sysvinit section. References: <58b21d29-f0b0-af8a-8c9e-11f4dd7a317a@gmail.com> In-Reply-To: <58b21d29-f0b0-af8a-8c9e-11f4dd7a317a@gmail.com> Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Apr 2020 16:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158679408426623 (code B ref 40601); Mon, 13 Apr 2020 16:09:03 +0000 Received: (at 40601) by debbugs.gnu.org; 13 Apr 2020 16:08:04 +0000 Received: from localhost ([127.0.0.1]:60566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cx-0006vG-R1 for submit@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:04 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:35046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cs-0006u1-1L for 40601@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:01 -0400 Received: by mail-wm1-f45.google.com with SMTP id r26so10536361wmh.0 for <40601@debbugs.gnu.org>; Mon, 13 Apr 2020 09:07:58 -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=sPjUeY1YzjgtcP6IGf1w7ZdV0iy1Z8k2oY14lOE1DM8=; b=EcSkikbEa+/D5R83P0CfjtT6AplHcDU3Qc0QlDmiJyL38Ds+rwiAYRt/05OkQZJwdq Wlwd+1oxV9Oh3Fs3VVU0U/93WB4pyfapA7hccfLLpJk0fMKQmJkdy5R8S9SePkS+xVbH r86XjgavSLmoNJveo91gSXmEFOFzJkGp0WU7F+MV7zek5Kqd1FDR/s6NpUQ6M3qDYIfS lwiYn+A9foayBK6QP292+15Bsy8PTToKldhRsy/sR8HuIWSXsEoicpXyBnSP7pq/khPe GcCtmP29HMkOmgouP5kxHkJ5rDj8R5JvBkj2FtmUaomPBx6rsKvQlGM7zMesaKIfNC48 BlDA== 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=sPjUeY1YzjgtcP6IGf1w7ZdV0iy1Z8k2oY14lOE1DM8=; b=t2eFEcaw0NQdYYf25rcWkuMwk9Lh1OEIFlAnxLz8XRvrj287iOTu8yF+MUKfnrZ4f/ B/hb0yFJROIeXkJBENyktCTfaeTYxyU+1MnBS5M0+vB3uuvfxB+5copBmkuhDW7UcH8W Hh9DRbqF262E4W3gC4qmLpH51Wc8Sssvcd2iNBVsCxPx8cdDEqPTom5ACIIFmJFjdErn C4+jNUcJzGJ8O41fvDpNRuy5mFOeC82/3u9MOYf0mEiX1pjC8c0rpvq9zyXAwznl5NZ4 l57XQAgY5ly9OX58MrW5f8D0s8wvaJtYtQ5spkREp+AB9ChL8esECyIA62ghXJFkkR5S iERA== X-Gm-Message-State: AGi0PuZ7jFiDahxSvMUFtBiuNysjMitgjG+lhRnp3hZe2FIqUH2t7ckY 8N33f6qHggfS/UpoX6IN1nePZY0C X-Google-Smtp-Source: APiQypKbDWwGW4Cc691K2wLDXwCaF0iqPGe1DX8FEd+Wc/Nt2uLbsKjZm70smIyZkDbEgmjJqPslvg== X-Received: by 2002:a1c:1bcb:: with SMTP id b194mr20188668wmb.4.1586794071897; Mon, 13 Apr 2020 09:07:51 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id g74sm15248774wme.44.2020.04.13.09.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 09:07:51 -0700 (PDT) From: Vincent Legoll Date: Mon, 13 Apr 2020 18:07:36 +0200 Message-Id: <20200413160740.19584-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * nix/local.mk (sysvinit): Add comment. --- nix/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/local.mk b/nix/local.mk index a64bdd2137..412d89ba3d 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -164,6 +164,7 @@ etc/guix-%.service: etc/guix-%.service.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +# The service script for sysvinit. sysvinitservicedir = $(sysconfdir)/init.d nodist_sysvinitservice_DATA = etc/init.d/guix-daemon From patchwork Mon Apr 13 16:07:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21220 X-Patchwork-Delegate: mail@cbaines.net 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 8E8B227BBE4; Mon, 13 Apr 2020 17:08:09 +0100 (BST) 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,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 ESMTP id 68C6527BBE1 for ; Mon, 13 Apr 2020 17:08:09 +0100 (BST) Received: from localhost ([::1]:46084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1d2-0004l8-Vm for patchwork@mira.cbaines.net; Mon, 13 Apr 2020 12:08:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59050) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1cx-0004kz-N3 for guix-patches@gnu.org; Mon, 13 Apr 2020 12:08:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jO1cw-0004sK-Rm for guix-patches@gnu.org; Mon, 13 Apr 2020 12:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jO1cw-0004sE-Ov for guix-patches@gnu.org; Mon, 13 Apr 2020 12:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jO1cw-0006uo-KY for guix-patches@gnu.org; Mon, 13 Apr 2020 12:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 2/5] guix-install.sh: Add xz to requirements. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Apr 2020 16:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158679408026564 (code B ref 40601); Mon, 13 Apr 2020 16:08:02 +0000 Received: (at 40601) by debbugs.gnu.org; 13 Apr 2020 16:08:00 +0000 Received: from localhost ([127.0.0.1]:60557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cu-0006uO-Ku for submit@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:00 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cs-0006u3-Vf for 40601@debbugs.gnu.org; Mon, 13 Apr 2020 12:07:59 -0400 Received: by mail-wr1-f66.google.com with SMTP id j2so10689033wrs.9 for <40601@debbugs.gnu.org>; Mon, 13 Apr 2020 09:07:58 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=gEnDcrkIqISuoFgT2g9SI5mmqJv2Gg8oKUUJE7WWzGA=; b=ItA0Ai5/+yH7y6GX8bXRm4VT6S5uZyJ4AH4bNlp52DCEaUmdPHXHtw+eukwi+by41u 8KS65Vxv0YtjCORG7RWZfilCRGKBHOLVJZ1UABxZtGmL+cU+nlRy+DWzH6X0Y5uDq2eD 2b7BwpOrJoOyBXNdFGOVLgWFvWsFLqyvarosp0MKz2NBntWRfBUh8jRFM8OibE2oIBee P81CgNwGwy8+CiFdnRbByqFozoqcrZph6y9iYsg42ydnITTcdxA3Zx8xMQP22Pg0aFDB i9N62mpaxM83Q7827LnxB71qIWNcacxrUW9ClrL1d9CoSQBioawc1ykIphah2KD3fDKz TWyw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gEnDcrkIqISuoFgT2g9SI5mmqJv2Gg8oKUUJE7WWzGA=; b=X5Mhl//CiopnE81VhwlTH1pOhsjCoOO+N+nM6BrRVoZCsFjH9Mhr+5p/7gG4VjX4zA ATs4mCHUeixMZDXAXeP32H8+Saht+w1pTG6JwGdVgglZ1Zq0TfCktGt20asp5PWIwl8a X0tw+NFYMWZ0YodETnH7rQts/mmx4zxBaoMMwfzEK8MEfMnAg5DJswixGwzTjMK2VHFK cOgEs93eEJbGs6OWVKIQEfrq9WQ1UQqLdM/kK9aUW3X9FgJ4oNwq9JSDG5tTjXJr0FMa ppIYcN5GbEU/EMzOy9Y/g+vVHeRxg5YzTKJ8OuK50FljYABPYQKTGCMPdW1Myr1HYgzq M1kA== X-Gm-Message-State: AGi0Pub9b3uKsxT1scMfLR4534990JCRzd0R7mCXxqBoTVIQqCVNgU4c b6I8kH1is94gaGHklYPsk+Mhv99i X-Google-Smtp-Source: APiQypKBN3J8jvjPBMsDGwX8TEXuxAdCwtDOskFdC2h9Cm1GIlAlFcL5pC1jEXj9d7rRe5PcJ4yiKA== X-Received: by 2002:a5d:4042:: with SMTP id w2mr11264410wrp.195.1586794072999; Mon, 13 Apr 2020 09:07:52 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id g74sm15248774wme.44.2020.04.13.09.07.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 09:07:52 -0700 (PDT) From: Vincent Legoll Date: Mon, 13 Apr 2020 18:07:37 +0200 Message-Id: <20200413160740.19584-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200413160740.19584-1-vincent.legoll@gmail.com> References: <20200413160740.19584-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * etc/guix-install.sh (REQUIRE): Add xz to requirements list. --- etc/guix-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 4909d3f162..dbc038a0ab 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -48,6 +48,7 @@ REQUIRE=( "groupadd" "tail" "tr" + "xz" ) PAS=$'[ \033[32;1mPASS\033[0m ] ' From patchwork Mon Apr 13 16:07:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21221 X-Patchwork-Delegate: mail@cbaines.net 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 2AC5327BBE4; Mon, 13 Apr 2020 17:09:11 +0100 (BST) 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,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 ESMTP id F3F7227BBE1 for ; Mon, 13 Apr 2020 17:09:10 +0100 (BST) Received: from localhost ([::1]:46090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1e2-000507-H0 for patchwork@mira.cbaines.net; Mon, 13 Apr 2020 12:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59123) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1dw-0004zE-KL for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jO1dv-0005Mw-8d for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jO1du-0005MR-Pi for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jO1du-0006wp-En for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 3/5] guix-install.sh: Fix systemctl not found error message at probe. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Apr 2020 16:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158679408326608 (code B ref 40601); Mon, 13 Apr 2020 16:09:02 +0000 Received: (at 40601) by debbugs.gnu.org; 13 Apr 2020 16:08:03 +0000 Received: from localhost ([127.0.0.1]:60562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cw-0006uu-RP for submit@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:03 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:44347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1ct-0006u5-TU for 40601@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:00 -0400 Received: by mail-wr1-f47.google.com with SMTP id d17so3784603wrg.11 for <40601@debbugs.gnu.org>; Mon, 13 Apr 2020 09:07:59 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=/Tnv2Wnq1LfCInJ2n2iQ3UEH/1X6A1FwhHxRDI+XDJA=; b=WV4WykBxT0kQ2A2WXoOR1e0Er2AUMVRWT9ls/8+T7azlDWjRAzDXQKHOjBZPUTNRFe TgUN9Vwa7Wph7jjc43n2KGxKWghLYjKPsRpi9RAjiRjQ/SyZUOD1LrSVNYE5Z3Wh2D16 3J7TRyG+nAXY7vqtn2PG9NiEviEFNIERcTTV0KBsNl1qkjZkTfwyv9Jaah5CesRz8QWf +joc9VxYP5Ux1cUn80yvG8E9m6f9WMsztQI3LbT0y++r1VSuohBtLh7NthR0GJ9zuoN+ celHfbTYX1QBimlK4NE3DcNQcaAIEdl+OeLOmiL4Lv/hLvzZz5Q+ZGIR/ZGzjvrnYwsx 5hQw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/Tnv2Wnq1LfCInJ2n2iQ3UEH/1X6A1FwhHxRDI+XDJA=; b=Ubk/jWGUgc7TLn1KHxYa2Y2zeSBIwzGQPIn11mYrRtrDmyeGgv4RKkKD8JPAjgmWVc EOc7wbCFNUN1XnIYhqxKO00G9fGbPnxSKx9vRI4XdMD4GaaaUx07oUWRjQ+zsM3twC8J R0If4FYHCe84SylkIgxLzlap+s14Y7vorkLU7EnI3anU8xjqDsZMeSjGQ9wpKno4I0tW zx7D08rYqJL7EcBTBJouXtMuITetUms4ZqPnfJURrdjPBPYMpGfgEYrYByZmvsc5FBqN 0x0dEs7lQ59JC6HZWpbuVWF7uEcKL26R3kpk0ouvmAMZDbFU5hh6Y+Sft7M6KvbPmsJ4 klOQ== X-Gm-Message-State: AGi0PuYuifsVSTnGp2fNjLs0/+kYi5cJSk+opXsq5E+pXIEJ9/VTgvlt AVyGyDm4XH60KYQerZKjUOzW2ez6 X-Google-Smtp-Source: APiQypLTbmlYyVHgioOOwdbhDAnQ0+9vpWY+6PkbW51GO8c5b0Re4Qg3sWQmjjEsxY2c8sRjUsK4uQ== X-Received: by 2002:adf:ee05:: with SMTP id y5mr8978129wrn.176.1586794074107; Mon, 13 Apr 2020 09:07:54 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id g74sm15248774wme.44.2020.04.13.09.07.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 09:07:53 -0700 (PDT) From: Vincent Legoll Date: Mon, 13 Apr 2020 18:07:38 +0200 Message-Id: <20200413160740.19584-3-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200413160740.19584-1-vincent.legoll@gmail.com> References: <20200413160740.19584-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * etc/guix-install.sh (chk_init_sys)[systemctl]: Redirect errors to /dev/null. --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index dbc038a0ab..4fa9664cf5 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -142,7 +142,7 @@ chk_init_sys() _msg "${INF}init system is: upstart" INIT_SYS="upstart" return 0 - elif [[ $(systemctl) =~ -\.mount ]]; then + elif [[ $(systemctl 2>/dev/null) =~ -\.mount ]]; then _msg "${INF}init system is: systemd" INIT_SYS="systemd" return 0 From patchwork Mon Apr 13 16:07:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21224 X-Patchwork-Delegate: mail@cbaines.net 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 6448327BBE4; Mon, 13 Apr 2020 17:09:18 +0100 (BST) 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,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 ESMTP id 2F1BC27BBE1 for ; Mon, 13 Apr 2020 17:09:18 +0100 (BST) Received: from localhost ([::1]:46102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1e9-0005C5-Nu for patchwork@mira.cbaines.net; Mon, 13 Apr 2020 12:09:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59128) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1dw-0004zF-Oq for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jO1dv-0005N9-Lo for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49023) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jO1dv-0005Ms-8M for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jO1dv-0006ww-49 for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 4/5] guix-install.sh: Handle local binary tarball file. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Apr 2020 16:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158679408426617 (code B ref 40601); Mon, 13 Apr 2020 16:09:03 +0000 Received: (at 40601) by debbugs.gnu.org; 13 Apr 2020 16:08:04 +0000 Received: from localhost ([127.0.0.1]:60564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cx-0006v3-7q for submit@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:03 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:53272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cu-0006u8-U1 for 40601@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:01 -0400 Received: by mail-wm1-f53.google.com with SMTP id d77so9780258wmd.3 for <40601@debbugs.gnu.org>; Mon, 13 Apr 2020 09:08:00 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=wV4+1jyL8qU7WCJsvI95UQYIXcSBn6faITajzYEeedA=; b=cbEL3BTTH2m0IOj9v1zg7i4mrXLswIS99BrOlNJ3g7d66YVs8/77uZrfcRogXFTuSS An9FVVbJg7y7qBt2K0SprEazuP8j4eFJueIIEIDYMfC6skm/yH6GTciirpLlfuWIXg+Z ABcGbMp/FGK3uN1nzLk7QviB6nx05ggkKg0OUKj8DMHjW/H516zmPdyEKrwCBUj1IIaj 6A4NinFqrAfTRNq6fA4fdEJWNrRCN7BoskP/bU0VFAN2s9ng/bhcFJ92YRFnCwQ22VFK 7aZWouWdUrn3oXjoOo0iIH3dH/Dcw3+80iJ0+5kCroH3yf02tDcagUOnqn6bcNttwILA ldew== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=wV4+1jyL8qU7WCJsvI95UQYIXcSBn6faITajzYEeedA=; b=G3tQUIarNaLv4bJJOy7tAvSjQnSZBiZStRDGaCagBzaYMf3l/D0G5jen1IU/z+Z2j7 08iD92k5HKhoZlwwP9Uu/t7VH37kD1Q0qYWpMfdur0PMz/Dq8v71pBNAkISq9JWhmLN+ tRXaShGjKzpdz2DZVmnlQWo3qx0sixqk1xR3WITfSHPShDR29O2Rg8x38kU671dOUGYp ewXN0OXplR+gcUA43C1b0DCYWnstvD8mO1sznhvkf/1qO1sNPVksfErdPmy843OUzOD9 f6gJKrPUAhbA7JpNdAfaqmd+P+1QRGYlKgNW7XWLKjgYDIzG8RSrv2yWtIFfxeTnNh5V weuQ== X-Gm-Message-State: AGi0PuYuHAylY08/ZdwT0hVKp+V1D2qSS/7xHCZ7vGYFTTF9nLKC3fVQ lvOPsJMDhGlxy0sOA7fFJD7ekvts X-Google-Smtp-Source: APiQypJi3B321cNV7cNvgYziACQfmBAgWzJ0NXdXepUHOKcWHwsE3OSJS7v4k0C/1R50EuGTUJg0zg== X-Received: by 2002:a1c:6787:: with SMTP id b129mr20203785wmc.165.1586794075046; Mon, 13 Apr 2020 09:07:55 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id g74sm15248774wme.44.2020.04.13.09.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 09:07:54 -0700 (PDT) From: Vincent Legoll Date: Mon, 13 Apr 2020 18:07:39 +0200 Message-Id: <20200413160740.19584-4-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200413160740.19584-1-vincent.legoll@gmail.com> References: <20200413160740.19584-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * etc/guix-install.sh (REQUIRE): add realpath. (main): Handle local binary tarball file path passed as first arg. --- etc/guix-install.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 4fa9664cf5..0d15a05cb4 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -4,6 +4,7 @@ # Copyright © 2018 Ricardo Wurmus # Copyright © 2018 Efraim Flashner # Copyright © 2019 Tobias Geerinckx-Rice +# Copyright © 2020 Vincent Legoll # # This file is part of GNU Guix. # @@ -47,6 +48,7 @@ REQUIRE=( "uname" "groupadd" "tail" + "realpath" "tr" "xz" ) @@ -482,10 +484,14 @@ main() umask 0022 tmp_path="$(mktemp -t -d guix.XXX)" - guix_get_bin_list "${GNU_URL}" - guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path" - - sys_create_store "${BIN_VER}.tar.xz" "${tmp_path}" + if [ -z "$1" ]; then + guix_get_bin_list "${GNU_URL}" + guix_get_bin "${GNU_URL}" "${BIN_VER}" "$tmp_path" + TARBALL="${BIN_VER}.tar.xz" + else + TARBALL="$(realpath $1)" + fi + sys_create_store "${TARBALL}" "${tmp_path}" sys_create_build_user sys_enable_guix_daemon sys_authorize_build_farms From patchwork Mon Apr 13 16:07:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21222 X-Patchwork-Delegate: mail@cbaines.net 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 F325F27BBE4; Mon, 13 Apr 2020 17:09:15 +0100 (BST) 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,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 ESMTP id 4138B27BBE1 for ; Mon, 13 Apr 2020 17:09:15 +0100 (BST) Received: from localhost ([::1]:46092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1e6-00054k-O3 for patchwork@mira.cbaines.net; Mon, 13 Apr 2020 12:09:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59164) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO1e0-00051d-5U for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jO1dw-0005OD-KA for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49025) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jO1dw-0005Nj-7V for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jO1dw-0006xB-16 for guix-patches@gnu.org; Mon, 13 Apr 2020 12:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 5/5] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Apr 2020 16:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40601@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40601-submit@debbugs.gnu.org id=B40601.158679409326649 (code B ref 40601); Mon, 13 Apr 2020 16:09:03 +0000 Received: (at 40601) by debbugs.gnu.org; 13 Apr 2020 16:08:13 +0000 Received: from localhost ([127.0.0.1]:60568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1d2-0006vc-4s for submit@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:13 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:41939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jO1cv-0006uA-WD for 40601@debbugs.gnu.org; Mon, 13 Apr 2020 12:08:04 -0400 Received: by mail-wr1-f41.google.com with SMTP id h9so10692205wrc.8 for <40601@debbugs.gnu.org>; Mon, 13 Apr 2020 09:08:01 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=d7XlIXph/dC3p0sp+I8C/nuk/eRXd6pCqWVW4IA61to=; b=TLcgwE4T3Unju7lw1EuNb35smtcCapQA/KC3BZf1NZJUBAzjG5wlEdrvqdkPNXd18G 4YMbFUqwr0ggEDkoT0uVW6QE7b6qbejS5ogONmja0y+OaRu5Iy8VUjZnMRzCRRFapnFv fOpRp/vK7BPWKiqJVClFkvNrllX68Bnn+DPEluYC/plPjeJspaq2QmISu5RJhJJDYmFG 5fhWH6yidi2yvGysyAvbTH3PVmLMhoTleUxC3kD7xnKUsK8grimiKHP+PUgJiuNIi9Sh YyEjOOtoRtW6Np/VKJ1vgFU6W/okUFCVcfFxaLsDFbpgkcWwptCApDirNzCusoIf2F2H MQfQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=d7XlIXph/dC3p0sp+I8C/nuk/eRXd6pCqWVW4IA61to=; b=A1uN7VNuILIC/OHZbM3TDVWxIW+BR2vUZkpvzw0ishyziHNOGpm2LYkNJLHBINCHes ZnwG4qia3W7tT1S22lw4FnT/UPdV4ZW6jIqsXVx4imXMxBS9XUZoKfz0TOag/GTH0vm5 fC4NViRV1wBFqe/eCoojvzDcPhZrPhpeBcAB4KoEI0BHTWIustS8IZ++WKAA774OPQoc 7VTB6jtcm75TCX6Xu8WZFavlQojcPW7CrHDCcCVjko65hvvGtHAPw1nr+PFTpjqxlJ03 JsT2RLaO/X0YAnY8oWvVltIOgjuypDnqk6aKm3rn+lvVXCObEI6sAnJKA9U/40fxjtwE LV9g== X-Gm-Message-State: AGi0PuZzykoIKqssWSf6w/iSHM3qAikY0Mcf6D3N3M6tP8OC8qgGSAbj 9PTuyv5iEsf/DNNe9tZgiWFw4mEl X-Google-Smtp-Source: APiQypJbUoz3JH0g6htS6vOQdQbDSb+/pF48Dfx7Fx3aZ9T4Nrj727JzWH22+su7hVU+qHUQUKWBbw== X-Received: by 2002:a5d:6310:: with SMTP id i16mr6506935wru.177.1586794076101; Mon, 13 Apr 2020 09:07:56 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id g74sm15248774wme.44.2020.04.13.09.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 09:07:55 -0700 (PDT) From: Vincent Legoll Date: Mon, 13 Apr 2020 18:07:40 +0200 Message-Id: <20200413160740.19584-5-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200413160740.19584-1-vincent.legoll@gmail.com> References: <20200413160740.19584-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * .gitignore: Add /etc/runit/run. * etc/guix-install.sh (chk_init_sys): Add case to detect runit. (sys_enable_guix_daemon): Add case to setup guix-daemon within runit. * etc/runit/run.in: New file. * nix/local.mk (etc/runit/run): Add target to generate etc/runit/run from etc/runit/run.in. (nodist_runitservice_DATA): New variable... (CLEANFILES): ... add it here. (runitservicedir): New variable. (EXTRA_DIST): Add etc/runit/run.in. --- .gitignore | 1 + etc/guix-install.sh | 11 +++++++++++ etc/runit/run.in | 15 +++++++++++++++ nix/local.mk | 13 +++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 etc/runit/run.in diff --git a/.gitignore b/.gitignore index fd2cf56098..89a2c89e1e 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ /etc/guix-publish.conf /etc/guix-publish.service /etc/init.d/guix-daemon +/etc/runit/run /guix-daemon /guix/config.scm /libformat.a diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 0d15a05cb4..06590ee97f 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -152,6 +152,10 @@ chk_init_sys() _msg "${INF}init system is: sysv-init" INIT_SYS="sysv-init" return 0 + elif [[ -d /etc/sv ]]; then + _msg "${INF}init system is: runit" + INIT_SYS="runit" + return 0 else INIT_SYS="NA" _err "${ERR}Init system could not be detected." @@ -364,6 +368,13 @@ sys_enable_guix_daemon() systemctl enable guix-daemon; } && _msg "${PAS}enabled Guix daemon via systemd" ;; + runit) + { cp -r "${ROOT_HOME}/.config/guix/current/lib/runit/guix-daemon" \ + /etc/sv; + chmod 755 /etc/sv/guix-daemon/run; + ln -s /etc/sv/guix-daemon /etc/runit/runsvdir/default/; } && + _msg "${PAS}enabled Guix daemon via runit" + ;; sysv-init) { mkdir -p /etc/init.d; cp "${ROOT_HOME}/.config/guix/current/etc/init.d/guix-daemon" \ diff --git a/etc/runit/run.in b/etc/runit/run.in new file mode 100644 index 0000000000..e57ef597bc --- /dev/null +++ b/etc/runit/run.in @@ -0,0 +1,15 @@ +#!/bin/sh + +# This is a "run script" for the runit init system to launch +# 'guix-daemon'. Drop it in /etc/sv/guix-daemon and add a symlink to +# it like the following to have 'guix-daemon' automatically started. +# ln -s /etc/sv/guix-daemon /etc/runit/runsvdir/default/ + +GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale +LC_ALL=en_US.utf8 + +export GUIX_LOCPATH LC_ALL + +exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ + --build-users-group=guixbuild + diff --git a/nix/local.mk b/nix/local.mk index 412d89ba3d..877ddcc281 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -175,6 +175,17 @@ etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +# The service run script for runit. +runitservicedir = $(libdir)/runit/guix-daemon +nodist_runitservice_DATA = etc/runit/run + +etc/runit/run: etc/runit/run.in \ + $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ + "$<" > "$@.tmp"; \ + mv "$@.tmp" "$@" + # The '.conf' jobs for Upstart. upstartjobdir = $(libdir)/upstart/system nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf @@ -189,6 +200,7 @@ etc/guix-%.conf: etc/guix-%.conf.in \ CLEANFILES += \ $(nodist_systemdservice_DATA) \ $(nodist_upstartjob_DATA) \ + $(nodist_runitservice_DATA) \ $(nodist_sysvinitservice_DATA) EXTRA_DIST += \ @@ -198,6 +210,7 @@ EXTRA_DIST += \ etc/guix-daemon.conf.in \ etc/guix-publish.service.in \ etc/guix-publish.conf.in \ + etc/runit/run.in \ etc/init.d/guix-daemon.in if CAN_RUN_TESTS