From: zimoun <zimon.toutoune@gmail.com>
To: 47407@debbugs.gnu.org
Cc: zimoun <zimon.toutoune@gmail.com>
Subject: [bug#47407] [PATCH] gnu: guix: Fix openrc init scripts.
Date: Fri, 26 Mar 2021 09:05:15 +0100 [thread overview]
Message-ID: <20210326080515.29679-1-zimon.toutoune@gmail.com> (raw)
Fixes <https://bugs.gnu.org/46871>.
* 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(-)
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 \
base-commit: 6e7ba45357078b31a369b23f8a9f38302dfcbb10
--
2.30.1
next reply other threads:[~2021-03-26 8:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 8:05 zimoun [this message]
2021-03-30 7:31 ` bug#47407: [PATCH] gnu: guix: Fix openrc init scripts Efraim Flashner
2021-03-30 8:24 ` [bug#47407] " zimoun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210326080515.29679-1-zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=47407@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).