From: Vincent Legoll <vincent.legoll@gmail.com>
To: 40601@debbugs.gnu.org
Cc: Vincent Legoll <vincent.legoll@gmail.com>
Subject: [bug#40601] [PATCH 15/28] guix-install.sh, guix-binary tarball: Handle openrc-based foreign distributions.
Date: Sun, 17 May 2020 19:17:12 +0200 [thread overview]
Message-ID: <20200517171725.732-15-vincent.legoll@gmail.com> (raw)
In-Reply-To: <20200517171725.732-1-vincent.legoll@gmail.com>
* .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
--
2.26.2
next prev parent reply other threads:[~2020-05-17 17:19 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 16:04 [bug#40601] [PATCH 0/5] Handle runit-based foreign distributions Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 1/5] nix/local.mk: Add missing comment to sysvinit section Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 2/5] guix-install.sh: Add xz to requirements Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 3/5] guix-install.sh: Fix systemctl not found error message at probe Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 4/5] guix-install.sh: Handle local binary tarball file Vincent Legoll
2020-04-13 16:07 ` [bug#40601] [PATCH 5/5] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions Vincent Legoll
2020-04-23 11:55 ` [bug#40601] bug#39023: binary installation manual doesn't work on Alpine Linux Vincent Legoll
2020-05-17 17:15 ` [bug#40601] [RFC, PATCH 0/28] guix-install.sh: port to other distros & init systems Vincent Legoll
2020-05-17 19:26 ` Julien Lepiller
2020-05-17 19:37 ` Vincent Legoll
2020-05-17 17:16 ` [bug#40601] [PATCH 01/28] nix/local.mk: Add missing comment to sysvinit section Vincent Legoll
2020-05-17 17:16 ` [bug#40601] [PATCH 02/28] guix-install.sh: Add xz to requirements Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 03/28] guix-install.sh: Fix systemctl not found error message at probe Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 04/28] guix-install.sh: Handle local binary tarball file Vincent Legoll
2020-05-23 13:42 ` Tobias Geerinckx-Rice via Guix-patches via
2020-05-23 21:37 ` Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 05/28] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 06/28] guix-install.sh: trivial whitespace fix Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 07/28] guix-install.sh: Move code in a new function Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 08/28] guix-install.sh: Use getent for both user & group presence checking Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 09/28] guix-install.sh: Fix requirements Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 10/28] guix-install.sh: Replace subshell-inducing command grouping Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 11/28] guix-install.sh: Use a variable for GPG key URL Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 12/28] guix-install.sh: Rework user & group handling, adding busybox support Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 13/28] guix-install.sh: Make grep & mktemp usage compatible with busybox Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 14/28] guix-install.sh: Make tar " Vincent Legoll
2020-05-17 17:17 ` Vincent Legoll [this message]
2020-05-17 17:17 ` [bug#40601] [PATCH 16/28] non-interactive mode, usage Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 17/28] fix variable quoting in sys_make_guix_available Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 18/28] Replace the use of "which" by "command -v" Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 19/28] Remove &> and >& bashisms Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 20/28] Add missing variable quoting & curly-bracketing for dl_path Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 21/28] Remove unused variable Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 22/28] Remove local bashisms Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 23/28] Remove $UID bashism Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 24/28] Remove some "[[" bashisms Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 25/28] Remove unused variable set by "read" Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 26/28] Add _debug_func() helper function Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 27/28] Fix variable use in guix_get_bin_list() Vincent Legoll
2020-05-17 17:17 ` [bug#40601] [PATCH 28/28] Remove "[[" bashisms in chk_init_sys() Vincent Legoll
2020-05-23 12:36 ` [bug#40601] [PATCH 01/28] nix/local.mk: Add missing comment to sysvinit section Tobias Geerinckx-Rice via Guix-patches via
2020-05-22 13:44 ` [bug#40601] [guix-daemon now working on parabola with openrc] jgart--- via Guix-patches via
2020-05-22 18:40 ` Leo Famulari
2020-05-31 20:41 ` [bug#40601] New reduced patchset, the easy bits first Vincent Legoll
2020-12-18 12:28 ` Christopher Baines
2020-12-18 19:35 ` Vincent Legoll
2020-12-20 17:30 ` Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 1/7] guix-install.sh: Remove "[[" bashisms in chk_init_sys() Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 2/7] guix-install.sh: Remove $UID bashism Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 3/7] guix-install.sh: Fix requirements Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 4/7] guix-install.sh: trivial whitespace fix Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 5/7] guix-install.sh: Add variable quoting in sys_make_guix_available Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 6/7] guix-install.sh: Fix variable uses in guix_get_bin_list() Vincent Legoll
2020-05-31 20:42 ` [bug#40601] [PATCH 7/7] guix-install.sh: Add missing variable quoting & curly-bracketing in guix_get_bin() Vincent Legoll
2020-12-18 11:37 ` Christopher Baines
2020-10-07 16:09 ` [bug#40601] [PATCH 0/5] Handle runit-based foreign distributions zimoun
2020-12-20 17:28 ` [bug#40601] [PATCH 1/5] guix-install.sh: Remove "[[" bashisms in chk_init_sys() Vincent Legoll
2020-12-20 17:28 ` [bug#40601] [PATCH 2/5] guix-install.sh: Remove $UID bashism Vincent Legoll
2020-12-23 12:17 ` Christopher Baines
2020-12-23 14:59 ` Vincent Legoll
2020-12-20 17:28 ` [bug#40601] [PATCH 3/5] guix-install.sh: Fix requirements Vincent Legoll
2020-12-20 17:28 ` [bug#40601] [PATCH 4/5] guix-install.sh: Fix detection of SysV init system Vincent Legoll
2020-12-20 17:28 ` [bug#40601] [PATCH 5/5] guix-install.sh: Check daemonize package presence for sysv-init Vincent Legoll
2021-09-02 17:51 ` [bug#40601] guix-daemon runit service on void jgart via Guix-patches via
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=20200517171725.732-15-vincent.legoll@gmail.com \
--to=vincent.legoll@gmail.com \
--cc=40601@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).