diff options
| author | zimoun <zimon.toutoune@gmail.com> | 2021-03-26 09:05:15 +0100 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-03-30 10:29:33 +0300 |
| commit | aed51ecea87f9b5045cc888cd1d9653a27813164 (patch) | |
| tree | 176281cf9079a0e4666bf02028bb36ca00417117 | |
| parent | 9feef62b73e284e106717a386624d6da90750a3d (diff) | |
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>
| -rw-r--r-- | gnu/packages/package-management.scm | 2 | ||||
| -rw-r--r-- | 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 de549fd094d..6ee0bc74e91 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm | |||
| @@ -212,7 +212,7 @@ $(prefix)/etc/init.d\n"))) | |||
| 212 | (substitute* "nix/local.mk" | 212 | (substitute* "nix/local.mk" |
| 213 | (("^openrcservicedir = .*$") | 213 | (("^openrcservicedir = .*$") |
| 214 | (string-append "openrcservicedir = \ | 214 | (string-append "openrcservicedir = \ |
| 215 | $(prefix)/etc/init.d\n"))) | 215 | $(prefix)/etc/openrc\n"))) |
| 216 | 216 | ||
| 217 | (invoke "sh" "bootstrap"))) | 217 | (invoke "sh" "bootstrap"))) |
| 218 | (add-before 'build 'use-host-compressors | 218 | (add-before 'build 'use-host-compressors |
diff --git a/nix/local.mk b/nix/local.mk index d2ce349d9ca..7c438ea78c5 100644 --- a/nix/local.mk +++ b/nix/local.mk | |||
| @@ -181,7 +181,7 @@ etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ | |||
| 181 | mv "$@.tmp" "$@" | 181 | mv "$@.tmp" "$@" |
| 182 | 182 | ||
| 183 | # The service script for openrc. | 183 | # The service script for openrc. |
| 184 | openrcservicedir = $(sysconfdir)/init.d | 184 | openrcservicedir = $(sysconfdir)/openrc |
| 185 | nodist_openrcservice_DATA = etc/openrc/guix-daemon | 185 | nodist_openrcservice_DATA = etc/openrc/guix-daemon |
| 186 | 186 | ||
| 187 | etc/openrc/guix-daemon: etc/openrc/guix-daemon.in \ | 187 | etc/openrc/guix-daemon: etc/openrc/guix-daemon.in \ |
