From patchwork Sun May 17 17:17:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 22155 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 EB70227BBE3; Sun, 17 May 2020 18:19:20 +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 31F7527BBE1 for ; Sun, 17 May 2020 18:19:20 +0100 (BST) Received: from localhost ([::1]:40928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaMwZ-0008OU-Lv for patchwork@mira.cbaines.net; Sun, 17 May 2020 13:19:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaMwQ-0008K2-6A for guix-patches@gnu.org; Sun, 17 May 2020 13:19:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaMwP-0004Mq-Rw for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaMwP-0007An-OS for guix-patches@gnu.org; Sun, 17 May 2020 13:19:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40601] [PATCH 15/28] guix-install.sh, guix-binary tarball: Handle openrc-based foreign distributions. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 17:19:09 +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.158973591527383 (code B ref 40601); Sun, 17 May 2020 17:19:09 +0000 Received: (at 40601) by debbugs.gnu.org; 17 May 2020 17:18:35 +0000 Received: from localhost ([127.0.0.1]:44600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvn-00077S-FY for submit@debbugs.gnu.org; Sun, 17 May 2020 13:18:34 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:42478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaMvJ-00072W-01 for 40601@debbugs.gnu.org; Sun, 17 May 2020 13:18:04 -0400 Received: by mail-wr1-f46.google.com with SMTP id s8so9077952wrt.9 for <40601@debbugs.gnu.org>; Sun, 17 May 2020 10:18: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=jWLsQQ8zfmfjTduylNRYeuxozIg+Z/8jJJII15/YMRk=; b=EIpOXRpNQVYQPjfG2J+icjtaGPCHQVREgqUT+oxJgWFxA7roNGsEvN6QHG2Jhjd7Y4 OMQJK/lY5doX7PyAX3ZswMgccBJS7KOglFDa21ND6icifkpVR9wte8LTkTHtg5Rgsj5B vQp1YlrzDmaSVrD5fCEUHjAI4EskoCQgJXmr9tEd62TlE2Aiq0pXpK6u3lGzqzGWHw/A H/Kj5P2JdTG2TZX7NbtioCrIjCgn4XBp0bJgPDKBXD6pSP1QCJm6f+haA8ACslOLPHCC WE/Q6hNYYahejrfE9TEEIhD1C+e9/pVeCNI4/l6Z6ohGSawdTTmrXKP8mWyyRGgmU2mA rI8g== 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=jWLsQQ8zfmfjTduylNRYeuxozIg+Z/8jJJII15/YMRk=; b=rg8FMfVTF8LSKhm/9awq7eyuhHdWwEKKiP+U9sVvKKceOsJX0lLkOLPIA8LA/p8NtQ Knf5GzBNt/WkPMTz7cOLN2SIGaNG23OxYYQk1/z5TyDwygCdfBllhA3A4VxoKVNvfQE4 wkGgvX827vel85nD2AIkgChLNpOrFMWzWgSIzG0rehkrCX1pnY3DclqscomabbfwGj6a VqOLZ+4pLQig2uP5IYzUgG3Fa9bI8bVyOeXoUy8mGPdUPRVSGzUniu2KqT4QqB54tNMW KkZ6rxTe2dY5FWKv+YZYNfsr5QyTJNVzfG1q85zyFGV89TURzdaB8gxXL2pEVikZfVis nXkA== X-Gm-Message-State: AOAM5303gACsh6xd2uPY7VuYNGXoH5w6fP3h7LqnUxJBvioXUoI9Fb2Z PT9eUdQmeAjhfF+DhX0ILj9akRtO X-Google-Smtp-Source: ABdhPJyt6HUe8hZLhwv9kJBTC/RjtDHSoD2L+FtkiwCM9+xnX/5siuj1ZcXgRNH1H7WN3iUa06VaTQ== X-Received: by 2002:a5d:55c5:: with SMTP id i5mr15050518wrw.402.1589735875094; Sun, 17 May 2020 10:17: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 v126sm13305048wma.9.2020.05.17.10.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 10:17:54 -0700 (PDT) From: Vincent Legoll Date: Sun, 17 May 2020 19:17:12 +0200 Message-Id: <20200517171725.732-15-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com> References: <20200517171725.732-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-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/openrc/guix-daemon.in. * etc/guix-install.sh (chk_init_sys): Add case to detect openrc. (sys_enable_guix_daemon): Add case to setup guix-daemon within openrc. * etc/openrc/guix-daemon.in: New file... * nix/local.mk (etc/openrc/guix-daemon): Add target to generate etc/openrc/guix-daemon from etc/openrc/guix-daemon.in. (CLEANFILES): ...add it here. (nodist_openrcservice_DATA): New variable... (openrcservicedir): New variable. (EXTRA_DIST): Add etc/openrc/guix-daemon.in. --- .gitignore | 1 + etc/guix-install.sh | 14 ++++++++++++++ etc/openrc/guix-daemon.in | 14 ++++++++++++++ nix/local.mk | 13 +++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 etc/openrc/guix-daemon.in diff --git a/.gitignore b/.gitignore index 89a2c89e1e..6cd9fb4f17 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ /etc/guix-publish.conf /etc/guix-publish.service /etc/init.d/guix-daemon +/etc/openrc/guix-daemon /etc/runit/run /guix-daemon /guix/config.scm diff --git a/etc/guix-install.sh b/etc/guix-install.sh index b5e8416610..1c22ae95ee 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -149,6 +149,10 @@ chk_init_sys() _msg "${INF}init system is: systemd" INIT_SYS="systemd" return 0 + elif [[ $(rc -V 2>/dev/null) =~ OpenRC ]]; then + _msg "${INF}init system is: openrc" + INIT_SYS="openrc" + return 0 elif [[ -f /etc/init.d/cron && ! -h /etc/init.d/cron ]]; then _msg "${INF}init system is: sysv-init" INIT_SYS="sysv-init" @@ -396,6 +400,16 @@ sys_enable_guix_daemon() ln -s /etc/sv/guix-daemon /etc/runit/runsvdir/default/; } && _msg "${PAS}enabled Guix daemon via runit" ;; + openrc) + { mkdir -p /etc/init.d; + cp "${ROOT_HOME}/.config/guix/current/lib/openrc/guix-daemon/guix-daemon" \ + /etc/init.d/guix-daemon; + chmod 755 /etc/init.d/guix-daemon; + + rc-update add guix-daemon default && + rc-service guix-daemon start; } && + _msg "${PAS}enabled Guix daemon via openrc" + ;; sysv-init) { mkdir -p /etc/init.d; cp "${ROOT_HOME}/.config/guix/current/etc/init.d/guix-daemon" \ diff --git a/etc/openrc/guix-daemon.in b/etc/openrc/guix-daemon.in new file mode 100644 index 0000000000..9641dcfad6 --- /dev/null +++ b/etc/openrc/guix-daemon.in @@ -0,0 +1,14 @@ +#!/sbin/openrc-run + +# This is a service script file for the openrc init system to launch +# 'guix-daemon'. Copy it as /etc/init.d/guix-daemon to have 'guix-daemon' +# automatically started. + +command=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon +command_args=--build-users-group=guixbuild +command_background=true +pidfile=/run/guix-daemon.pid + +GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale +LC_ALL=en_US.utf8 + diff --git a/nix/local.mk b/nix/local.mk index 582ff16168..9d6f92ebc8 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -187,6 +187,17 @@ etc/runit/run: etc/runit/run.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +# The service script for openrc. +openrcservicedir = $(libdir)/openrc/guix-daemon +nodist_openrcservice_DATA = etc/openrc/guix-daemon + +etc/openrc/guix-daemon: etc/openrc/guix-daemon.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 @@ -202,6 +213,7 @@ CLEANFILES += \ $(nodist_systemdservice_DATA) \ $(nodist_upstartjob_DATA) \ $(nodist_runitservice_DATA) \ + $(nodist_openrcservice_DATA) \ $(nodist_sysvinitservice_DATA) EXTRA_DIST += \ @@ -212,6 +224,7 @@ EXTRA_DIST += \ etc/guix-publish.service.in \ etc/guix-publish.conf.in \ etc/runit/run.in \ + etc/openrc/guix-daemon.in \ etc/init.d/guix-daemon.in if CAN_RUN_TESTS