[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: guix: Fix openrc init scripts.
From: |
guix-commits |
Subject: |
branch master updated: gnu: guix: Fix openrc init scripts. |
Date: |
Tue, 30 Mar 2021 03:31:31 -0400 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new aed51ec gnu: guix: Fix openrc init scripts.
aed51ec is described below
commit aed51ecea87f9b5045cc888cd1d9653a27813164
Author: zimoun <zimon.toutoune@gmail.com>
AuthorDate: Fri Mar 26 09:05:15 2021 +0100
gnu: guix: Fix openrc init scripts.
Fixes <https://bugs.gnu.org/46871>.
* gnu/packages/package-management.scm (guix)[arguments]: Fix openrc init.
* nix/local.mk (openrcservicedir): Likewise.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
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 de549fd..6ee0bc7 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 d2ce349..7c438ea 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 \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: guix: Fix openrc init scripts.,
guix-commits <=