02/02: build: Don't embed absolute paths in .service and .conf service files.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 613d0895b92c677e0639d5e77c55043e38e020c8
Author: Leo Famulari <address@hidden>
Date:   Sun Mar 5 14:33:13 2017 -0500

    build: Don't embed absolute paths in .service and .conf service files.
    
    Otherwise, users will be stuck running an old copy of guix and the 
guix-daemon
    if they copy the service files instead of symlinking them.
    
    * etc/guix-daemon.conf.in, etc/guix-daemon.service.in, 
etc/guix-publish.conf.in,
    etc/guix-publish.service.in: Expand @localstatedir@ instead of 
@address@hidden
    * nix/local.mk (etc/guix-%.service, etc/guix-%.conf): Use @localstatedir@
    instead of @address@hidden
---
 etc/guix-daemon.conf.in     | 2 +-
 etc/guix-daemon.service.in  | 2 +-
 etc/guix-publish.conf.in    | 2 +-
 etc/guix-publish.service.in | 2 +-
 nix/local.mk                | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/guix-daemon.conf.in b/etc/guix-daemon.conf.in
index 8f833cb..09c70cd 100644
--- a/etc/guix-daemon.conf.in
+++ b/etc/guix-daemon.conf.in
@@ -9,4 +9,4 @@ stop on runlevel [016]
 
 task
 
-exec @bindir@/guix-daemon --build-users-group=guixbuild
+exec @localstatedir@/guix/profiles/per-user/root/guix-profile/bin/guix-daemon 
--build-users-group=guixbuild
diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in
index ab0ce09..ffe4cf9 100644
--- a/etc/guix-daemon.service.in
+++ b/etc/guix-daemon.service.in
@@ -6,7 +6,7 @@
 Description=Build daemon for GNU Guix
 
 [Service]
address@hidden@/guix-daemon --build-users-group=guixbuild
address@hidden@/guix/profiles/per-user/root/guix-profile/bin/guix-daemon 
--build-users-group=guixbuild
 Environment=GUIX_LOCPATH=/root/.guix-profile/lib/locale
 RemainAfterExit=yes
 StandardOutput=syslog
diff --git a/etc/guix-publish.conf.in b/etc/guix-publish.conf.in
index 498fa29..241c594 100644
--- a/etc/guix-publish.conf.in
+++ b/etc/guix-publish.conf.in
@@ -9,4 +9,4 @@ stop on runlevel [016]
 
 task
 
-exec @bindir@/guix publish --user=nobody --port=8181
+exec @localstatedir@/guix/profiles/per-user/root/guix-profile/bin/guix publish 
--user=nobody --port=8181
diff --git a/etc/guix-publish.service.in b/etc/guix-publish.service.in
index fc4e3c2..8aaf09e 100644
--- a/etc/guix-publish.service.in
+++ b/etc/guix-publish.service.in
@@ -6,7 +6,7 @@
 Description=Publish the GNU Guix store
 
 [Service]
address@hidden@/guix publish --user=nobody --port=8181
address@hidden@/guix/profiles/per-user/root/guix-profile/bin/guix publish 
--user=nobody --port=8181
 Environment=GUIX_LOCPATH=/root/.guix-profile/lib/locale
 RemainAfterExit=yes
 StandardOutput=syslog
diff --git a/nix/local.mk b/nix/local.mk
index eb70d26..9e0c457 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -190,7 +190,7 @@ nodist_systemdservice_DATA = etc/guix-daemon.service 
etc/guix-publish.service
 etc/guix-%.service: etc/guix-%.service.in      \
                         $(top_builddir)/config.status
        $(AM_V_GEN)$(MKDIR_P) "`dirname address@hidden";        \
-       $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+       $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' <   \
               "$<" > "address@hidden";         \
        mv "address@hidden" "$@"
 
@@ -201,7 +201,7 @@ nodist_upstartjob_DATA = etc/guix-daemon.conf 
etc/guix-publish.conf
 etc/guix-%.conf: etc/guix-%.conf.in    \
                         $(top_builddir)/config.status
        $(AM_V_GEN)$(MKDIR_P) "`dirname address@hidden";        \
-       $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+       $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' <   \
               "$<" > "address@hidden";         \
        mv "address@hidden" "$@"