Add 'guix-daemon.conf' job for Upstart.
* etc/guix-daemon.conf.in: New file. * daemon.am (CLEANFILES): Add etc/guix-daemon.conf. (upstartjobdir, nodist_upstartjob_DATA): New variables. (EXTRA_DIST): Add etc/guix-daemon.conf.in. * doc/guix.texi (Binary Installation, Build Environment Setup): Mention 'guix-daemon.conf'. Signed-off-by: Mario Daniel Ruiz Saavedra <desiderantes@rocketmail.com> Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
5432734b00
commit
ad227484c3
|
@ -125,6 +125,7 @@ GTAGS
|
||||||
/doc/os-config-desktop.texi
|
/doc/os-config-desktop.texi
|
||||||
/doc/*.1
|
/doc/*.1
|
||||||
/etc/guix-daemon.service
|
/etc/guix-daemon.service
|
||||||
|
/etc/guix-daemon.conf
|
||||||
/doc/images/bootstrap-graph.pdf
|
/doc/images/bootstrap-graph.pdf
|
||||||
/doc/images/coreutils-bag-graph.png
|
/doc/images/coreutils-bag-graph.png
|
||||||
/doc/images/coreutils-graph.png
|
/doc/images/coreutils-graph.png
|
||||||
|
|
16
daemon.am
16
daemon.am
|
@ -21,7 +21,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
BUILT_SOURCES += nix/libstore/schema.sql.hh
|
BUILT_SOURCES += nix/libstore/schema.sql.hh
|
||||||
CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service
|
CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf
|
||||||
|
|
||||||
noinst_LIBRARIES = libformat.a libutil.a libstore.a
|
noinst_LIBRARIES = libformat.a libutil.a libstore.a
|
||||||
|
|
||||||
|
@ -191,11 +191,23 @@ etc/guix-daemon.service: etc/guix-daemon.service.in \
|
||||||
"$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"
|
"$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"
|
||||||
mv "$@.tmp" "$@"
|
mv "$@.tmp" "$@"
|
||||||
|
|
||||||
|
# The '.conf' job for Upstart.
|
||||||
|
upstartjobdir = $(libdir)/upstart/system
|
||||||
|
nodist_upstartjob_DATA = etc/guix-daemon.conf
|
||||||
|
|
||||||
|
etc/guix-daemon.conf: etc/guix-daemon.conf.in \
|
||||||
|
$(top_builddir)/config.status
|
||||||
|
$(MKDIR_P) "`dirname "$@"`"
|
||||||
|
$(SED) -e 's|@''bindir''@|$(bindir)|' < \
|
||||||
|
"$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp"
|
||||||
|
mv "$@.tmp" "$@"
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
nix/libstore/schema.sql \
|
nix/libstore/schema.sql \
|
||||||
nix/AUTHORS \
|
nix/AUTHORS \
|
||||||
nix/COPYING \
|
nix/COPYING \
|
||||||
etc/guix-daemon.service.in
|
etc/guix-daemon.service.in \
|
||||||
|
etc/guix-daemon.conf.in
|
||||||
|
|
||||||
AM_TESTS_ENVIRONMENT += \
|
AM_TESTS_ENVIRONMENT += \
|
||||||
top_builddir="$(abs_top_builddir)"
|
top_builddir="$(abs_top_builddir)"
|
||||||
|
|
|
@ -366,6 +366,10 @@ On hosts using the systemd init system, drop
|
||||||
@file{~root/.guix-profile/lib/systemd/system/guix-daemon.service} in
|
@file{~root/.guix-profile/lib/systemd/system/guix-daemon.service} in
|
||||||
@file{/etc/systemd/system}.
|
@file{/etc/systemd/system}.
|
||||||
|
|
||||||
|
Likewise, on hosts using the Upstart init system, drop
|
||||||
|
@file{~root/.guix-profile/lib/upstart/system/guix-daemon.conf} in
|
||||||
|
@file{/etc/init}.
|
||||||
|
|
||||||
@item
|
@item
|
||||||
Make the @command{guix} command available to other users on the machine,
|
Make the @command{guix} command available to other users on the machine,
|
||||||
for instance with:
|
for instance with:
|
||||||
|
@ -554,7 +558,10 @@ parallel, as specified by the @option{--max-jobs} option
|
||||||
following command@footnote{If your machine uses the systemd init system,
|
following command@footnote{If your machine uses the systemd init system,
|
||||||
dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service}
|
dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service}
|
||||||
file in @file{/etc/systemd/system} will ensure that
|
file in @file{/etc/systemd/system} will ensure that
|
||||||
@command{guix-daemon} is automatically started.}:
|
@command{guix-daemon} is automatically started. Similarly, if your
|
||||||
|
machine uses the Upstart init system, drop the
|
||||||
|
@file{@var{prefix}/lib/upstart/system/guix-daemon.conf}
|
||||||
|
file in @file{/etc/init}.}:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
# guix-daemon --build-users-group=guixbuild
|
# guix-daemon --build-users-group=guixbuild
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
# This is a "job" for the Upstart init system to launch 'guix-daemon'.
|
||||||
|
# Drop it in /etc/init to have 'guix-daemon' automatically started.
|
||||||
|
|
||||||
|
description "Build daemon for GNU Guix"
|
||||||
|
|
||||||
|
start on runlevel [2345]
|
||||||
|
|
||||||
|
stop on runlevel [016]
|
||||||
|
|
||||||
|
task
|
||||||
|
|
||||||
|
exec @bindir@/guix-daemon --build-users-group=guixbuild
|
Loading…
Reference in New Issue