| Message ID | 20210326080515.29679-1-zimon.toutoune@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#47407] gnu: guix: Fix openrc init scripts. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/submitting builds | success | |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
Thanks. Patch pushed.
Hi Efraim, On Tue, 30 Mar 2021 at 09:32, Efraim Flashner <efraim@flashner.co.il> wrote: > > Thanks. Patch pushed. Thanks. Cheers, simon
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 \
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(-) base-commit: 6e7ba45357078b31a369b23f8a9f38302dfcbb10